alxarafe / alixar

htdocs/accountancy/journal/bankjournal.php

Spacing +197 added lines, -197 removed lines

@@ -369,12 +369,12 @@ 
 				if ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
 					$paymentstatic->ref = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentstatic->getNomUrl(2, '', ''); // TODO Do not include list of invoice in tooltip, the dol_string_nohtmltag is ko with this
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2, '', ''); // TODO Do not include list of invoice in tooltip, the dol_string_nohtmltag is ko with this
 					$tabpay[$obj->rowid]["paymentid"] = $paymentstatic->id;
 				} elseif ($links[$key]['type'] == 'payment_supplier') {
 					$paymentsupplierstatic->id = $links[$key]['url_id'];
 					$paymentsupplierstatic->ref = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentsupplierstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsupplierstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentsupplierid"] = $paymentsupplierstatic->id;
 				} elseif ($links[$key]['type'] == 'company') {
 					$societestatic->id = $links[$key]['url_id'];
@@ -409,7 +409,7 @@ 
 					$chargestatic->id = $links[$key]['url_id'];
 					$chargestatic->ref = $links[$key]['url_id'];
 
-					$tabpay[$obj->rowid]["lib"] .= ' '.$chargestatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
 					$reg = array();
 					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
 						if ($reg[1] == 'socialcontribution') {
@@ -426,13 +426,13 @@ 
 					// Retrieve the accounting code of the social contribution of the payment from link of payment.
 					// Note: We have the social contribution id, it can be faster to get accounting code from social contribution id.
 					$sqlmid = "SELECT cchgsoc.accountancy_code";
-					$sqlmid .= " FROM ".MAIN_DB_PREFIX."c_chargesociales cchgsoc";
-					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."chargesociales as chgsoc ON chgsoc.fk_type = cchgsoc.id";
-					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."paiementcharge as paycharg ON paycharg.fk_charge = chgsoc.rowid";
-					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."bank_url as bkurl ON bkurl.url_id=paycharg.rowid AND bkurl.type = 'payment_sc'";
-					$sqlmid .= " WHERE bkurl.fk_bank = ".((int) $obj->rowid);
+					$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc";
+					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON chgsoc.fk_type = cchgsoc.id";
+					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON paycharg.fk_charge = chgsoc.rowid";
+					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON bkurl.url_id=paycharg.rowid AND bkurl.type = 'payment_sc'";
+					$sqlmid .= " WHERE bkurl.fk_bank = " . ((int) $obj->rowid);
 
-					dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=".$sqlmid, LOG_DEBUG);
+					dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
 					$resultmid = $db->query($sqlmid);
 					if ($resultmid) {
 						$objmid = $db->fetch_object($resultmid);
@@ -442,14 +442,14 @@ 
 					$paymentdonstatic->id = $links[$key]['url_id'];
 					$paymentdonstatic->ref = $links[$key]['url_id'];
 					$paymentdonstatic->fk_donation = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentdonstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentdonstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentdonationid"] = $paymentdonstatic->id;
 					$tabtp[$obj->rowid][$account_pay_donation] += $amounttouse;
 				} elseif ($links[$key]['type'] == 'member') {
 					$paymentsubscriptionstatic->id = $links[$key]['url_id'];
 					$paymentsubscriptionstatic->ref = $links[$key]['url_id'];
 					$paymentsubscriptionstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentsubscriptionstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsubscriptionstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentsubscriptionid"] = $paymentsubscriptionstatic->id;
 					$paymentsubscriptionstatic->fetch($paymentsubscriptionstatic->id);
 					$tabtp[$obj->rowid][$account_pay_subscription] += $amounttouse;
@@ -457,14 +457,14 @@ 
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $links[$key]['url_id'];
 					$paymentvatstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentvatstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentvatid"] = $paymentvatstatic->id;
 					$tabtp[$obj->rowid][$account_pay_vat] += $amounttouse;
 				} elseif ($links[$key]['type'] == 'payment_salary') {
 					$paymentsalstatic->id = $links[$key]['url_id'];
 					$paymentsalstatic->ref = $links[$key]['url_id'];
 					$paymentsalstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentsalstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentsalid"] = $paymentsalstatic->id;
 
 					// This part of code is no more required. it is here to solve case where a link were missing (with v14.0.0) and keep writing in accountancy complete.
@@ -512,7 +512,7 @@ 
 					$paymentvariousstatic->id = $links[$key]['url_id'];
 					$paymentvariousstatic->ref = $links[$key]['url_id'];
 					$paymentvariousstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentvariousstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvariousstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentvariousid"] = $paymentvariousstatic->id;
 					$paymentvariousstatic->fetch($paymentvariousstatic->id);
 					$account_various = (!empty($paymentvariousstatic->accountancy_code) ? $paymentvariousstatic->accountancy_code : 'NotDefined'); // NotDefined is a reserved word
@@ -523,14 +523,14 @@ 
 					$paymentloanstatic->id = $links[$key]['url_id'];
 					$paymentloanstatic->ref = $links[$key]['url_id'];
 					$paymentloanstatic->fk_loan = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentloanstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentloanstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentloanid"] = $paymentloanstatic->id;
 					//$tabtp[$obj->rowid][$account_pay_loan] += $amounttouse;
 					$sqlmid = 'SELECT pl.amount_capital, pl.amount_insurance, pl.amount_interest, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest';
-					$sqlmid .= ' FROM '.MAIN_DB_PREFIX.'payment_loan as pl, '.MAIN_DB_PREFIX.'loan as l';
-					$sqlmid .= ' WHERE l.rowid = pl.fk_loan AND pl.fk_bank = '.((int) $obj->rowid);
+					$sqlmid .= ' FROM ' . MAIN_DB_PREFIX . 'payment_loan as pl, ' . MAIN_DB_PREFIX . 'loan as l';
+					$sqlmid .= ' WHERE l.rowid = pl.fk_loan AND pl.fk_bank = ' . ((int) $obj->rowid);
 
-					dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=".$sqlmid, LOG_DEBUG);
+					dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
 					$resultmid = $db->query($sqlmid);
 					if ($resultmid) {
 						$objmid = $db->fetch_object($resultmid);
@@ -540,7 +540,7 @@ 
 					}
 				} elseif ($links[$key]['type'] == 'banktransfert') {
 					$accountLinestatic->fetch($links[$key]['url_id']);
-					$tabpay[$obj->rowid]["lib"] .= ' '.$langs->trans("BankTransfer").'- '.$accountLinestatic ->getNomUrl(1);
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("BankTransfer") . '- ' . $accountLinestatic ->getNomUrl(1);
 					$tabtp[$obj->rowid][$account_transfer] += $amounttouse;
 					$bankaccountstatic->fetch($tabpay[$obj->rowid]['fk_bank_account']);
 					$tabpay[$obj->rowid]["soclib"] = $bankaccountstatic->getNomUrl(2);
@@ -653,16 +653,16 @@ 
 			// Line into bank account
 			foreach ($tabbq[$key] as $k => $mt) {
 				if ($mt) {
-					$accountingaccount->fetch(null, $k, true);	// $k is accounting bank account. TODO We should use a cache here to avoid this fetch
+					$accountingaccount->fetch(null, $k, true); // $k is accounting bank account. TODO We should use a cache here to avoid this fetch
 					$account_label = $accountingaccount->label;
 
 					$reflabel = '';
 					if (!empty($val['lib'])) {
-						$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+						$reflabel .= dol_string_nohtmltag($val['lib']) . " - ";
 					}
-					$reflabel .= $langs->trans("Bank").' '.dol_string_nohtmltag($val['bank_account_ref']);
+					$reflabel .= $langs->trans("Bank") . ' ' . dol_string_nohtmltag($val['bank_account_ref']);
 					if (!empty($val['soclib'])) {
-						$reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+						$reflabel .= " - " . dol_string_nohtmltag($val['soclib']);
 					}
 
 					$bookkeeping = new BookKeeping($db);
@@ -698,7 +698,7 @@ 
 						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 							$error++;
 							$errorforline++;
-							setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+							setEventMessages('Transaction for (' . $bookkeeping->doc_type . ', ' . $bookkeeping->fk_doc . ', ' . $bookkeeping->fk_docdet . ') were already recorded', null, 'warnings');
 						} else {
 							$error++;
 							$errorforline++;
@@ -719,10 +719,10 @@ 
 
 						$reflabel = '';
 						if (!empty($val['lib'])) {
-							$reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
+							$reflabel .= dol_string_nohtmltag($val['lib']) . ($val['soclib'] ? " - " : "");
 						}
 						if ($tabtype[$key] == 'banktransfert') {
-							$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
+							$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount') . ' ' . $account_transfer);
 						} else {
 							$reflabel .= dol_string_nohtmltag($val['soclib']);
 						}
@@ -769,43 +769,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(null, $k, true);	// TODO Use a cache
+							$accountingaccount->fetch(null, $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(null, $k, true);		// TODO Use a cache
+							$accountingaccount->fetch(null, $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(null, $k, true);		// TODO Use a cache
+							$accountingaccount->fetch(null, $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(null, $k, true);		// TODO Use a cache
+							$accountingaccount->fetch(null, $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(null, $k, true);		// TODO Use a cache
+							$accountingaccount->fetch(null, $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(null, $tabpay[$key]["account_various"], true);	// TODO Use a cache
+							$accountingaccount->fetch(null, $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(null, $k, true);		// TODO Use a cache
+							$accountingaccount->fetch(null, $k, true); // TODO Use a cache
 							$bookkeeping->numero_compte = $k;
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} else {
@@ -828,7 +828,7 @@ 
 							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 								$error++;
 								$errorforline++;
-								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+								setEventMessages('Transaction for (' . $bookkeeping->doc_type . ', ' . $bookkeeping->fk_doc . ', ' . $bookkeeping->fk_docdet . ') were already recorded', null, 'warnings');
 							} else {
 								$error++;
 								$errorforline++;
@@ -848,7 +848,7 @@ 
 					if ($mt) {
 						$reflabel = '';
 						if (!empty($val['lib'])) {
-							$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+							$reflabel .= dol_string_nohtmltag($val['lib']) . " - ";
 						}
 						$reflabel .= dol_string_nohtmltag('WaitingAccount');
 
@@ -879,7 +879,7 @@ 
 							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 								$error++;
 								$errorforline++;
-								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+								setEventMessages('Transaction for (' . $bookkeeping->doc_type . ', ' . $bookkeeping->fk_doc . ', ' . $bookkeeping->fk_docdet . ') were already recorded', null, 'warnings');
 							} else {
 								$error++;
 								$errorforline++;
@@ -894,7 +894,7 @@ 
 		if (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT')) {
 			$error++;
 			$errorforline++;
-			setEventMessages('We tried to insert a non balanced transaction in book for '.$ref.'. Canceled. Surely a bug.', null, 'errors');
+			setEventMessages('We tried to insert a non balanced transaction in book for ' . $ref . '. Canceled. Surely a bug.', null, 'errors');
 		}
 
 		if (!$errorforline) {
@@ -905,7 +905,7 @@ 
 
 			$MAXNBERRORS = 5;
 			if ($error >= $MAXNBERRORS) {
-				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped").' (>'.$MAXNBERRORS.')', null, 'errors');
+				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped") . ' (>' . $MAXNBERRORS . ')', null, 'errors');
 				break; // Break in the foreach
 			}
 		}
@@ -923,15 +923,15 @@ 
 
 	// Must reload data, so we make a redirect
 	if (count($tabpay) != $error) {
-		$param = 'id_journal='.$id_journal;
-		$param .= '&date_startday='.$date_startday;
-		$param .= '&date_startmonth='.$date_startmonth;
-		$param .= '&date_startyear='.$date_startyear;
-		$param .= '&date_endday='.$date_endday;
-		$param .= '&date_endmonth='.$date_endmonth;
-		$param .= '&date_endyear='.$date_endyear;
-		$param .= '&in_bookkeeping='.$in_bookkeeping;
-		header("Location: ".$_SERVER['PHP_SELF'].($param ? '?'.$param : ''));
+		$param = 'id_journal=' . $id_journal;
+		$param .= '&date_startday=' . $date_startday;
+		$param .= '&date_startmonth=' . $date_startmonth;
+		$param .= '&date_startyear=' . $date_startyear;
+		$param .= '&date_endday=' . $date_endday;
+		$param .= '&date_endmonth=' . $date_endmonth;
+		$param .= '&date_endyear=' . $date_endyear;
+		$param .= '&in_bookkeeping=' . $in_bookkeeping;
+		header("Location: " . $_SERVER['PHP_SELF'] . ($param ? '?' . $param : ''));
 		exit;
 	}
 }
@@ -944,20 +944,20 @@ 
 
 	$filename = 'journal';
 	$type_export = 'journal';
-	include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
+	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 
 	// CSV header line
-	print '"'.$langs->transnoentitiesnoconv("BankId").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("Date").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("PaymentMode").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("AccountAccounting").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("LedgerAccount").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("SubledgerAccount").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("Label").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("AccountingDebit").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("AccountingCredit").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("Journal").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("Note").'"'.$sep;
+	print '"' . $langs->transnoentitiesnoconv("BankId") . '"' . $sep;
+	print '"' . $langs->transnoentitiesnoconv("Date") . '"' . $sep;
+	print '"' . $langs->transnoentitiesnoconv("PaymentMode") . '"' . $sep;
+	print '"' . $langs->transnoentitiesnoconv("AccountAccounting") . '"' . $sep;
+	print '"' . $langs->transnoentitiesnoconv("LedgerAccount") . '"' . $sep;
+	print '"' . $langs->transnoentitiesnoconv("SubledgerAccount") . '"' . $sep;
+	print '"' . $langs->transnoentitiesnoconv("Label") . '"' . $sep;
+	print '"' . $langs->transnoentitiesnoconv("AccountingDebit") . '"' . $sep;
+	print '"' . $langs->transnoentitiesnoconv("AccountingCredit") . '"' . $sep;
+	print '"' . $langs->transnoentitiesnoconv("Journal") . '"' . $sep;
+	print '"' . $langs->transnoentitiesnoconv("Note") . '"' . $sep;
 	print "\n";
 
 	foreach ($tabpay as $key => $val) {
@@ -970,24 +970,24 @@ 
 			if ($mt) {
 				$reflabel = '';
 				if (!empty($val['lib'])) {
-					$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+					$reflabel .= dol_string_nohtmltag($val['lib']) . " - ";
 				}
-				$reflabel .= $langs->trans("Bank").' '.dol_string_nohtmltag($val['bank_account_ref']);
+				$reflabel .= $langs->trans("Bank") . ' ' . dol_string_nohtmltag($val['bank_account_ref']);
 				if (!empty($val['soclib'])) {
-					$reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+					$reflabel .= " - " . dol_string_nohtmltag($val['soclib']);
 				}
 
-				print '"'.$key.'"'.$sep;
-				print '"'.$date.'"'.$sep;
-				print '"'.$val["type_payment"].'"'.$sep;
-				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-				print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
-				print "  ".$sep;
-				print '"'.$reflabel.'"'.$sep;
-				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-				print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
-				print '"'.$journal.'"'.$sep;
-				print '"'.dol_string_nohtmltag($ref).'"'.$sep;
+				print '"' . $key . '"' . $sep;
+				print '"' . $date . '"' . $sep;
+				print '"' . $val["type_payment"] . '"' . $sep;
+				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+				print "  " . $sep;
+				print '"' . $reflabel . '"' . $sep;
+				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+				print '"' . ($mt < 0 ? price(-$mt) : '') . '"' . $sep;
+				print '"' . $journal . '"' . $sep;
+				print '"' . dol_string_nohtmltag($ref) . '"' . $sep;
 				print "\n";
 			}
 		}
@@ -998,35 +998,35 @@ 
 				if ($mt) {
 					$reflabel = '';
 					if (!empty($val['lib'])) {
-						$reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
+						$reflabel .= dol_string_nohtmltag($val['lib']) . ($val['soclib'] ? " - " : "");
 					}
 					if ($tabtype[$key] == 'banktransfert') {
-						$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
+						$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount') . ' ' . $account_transfer);
 					} else {
 						$reflabel .= dol_string_nohtmltag($val['soclib']);
 					}
 
-					print '"'.$key.'"'.$sep;
-					print '"'.$date.'"'.$sep;
-					print '"'.$val["type_payment"].'"'.$sep;
-					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+					print '"' . $key . '"' . $sep;
+					print '"' . $date . '"' . $sep;
+					print '"' . $val["type_payment"] . '"' . $sep;
+					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
 					if ($tabtype[$key] == 'payment_supplier') {
-						print '"'.getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER').'"'.$sep;
+						print '"' . getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') . '"' . $sep;
 					} elseif ($tabtype[$key] == 'payment') {
-						print '"'.getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER').'"'.$sep;
+						print '"' . getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') . '"' . $sep;
 					} elseif ($tabtype[$key] == 'payment_expensereport') {
-						print '"'.getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT').'"'.$sep;
+						print '"' . getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') . '"' . $sep;
 					} elseif ($tabtype[$key] == 'payment_salary') {
-						print '"'.getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT').'"'.$sep;
+						print '"' . getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') . '"' . $sep;
 					} else {
-						print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+						print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
 					}
-					print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
-					print '"'.$reflabel.'"'.$sep;
-					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
-					print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-					print '"'.$journal.'"'.$sep;
-					print '"'.dol_string_nohtmltag($ref).'"'.$sep;
+					print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+					print '"' . $reflabel . '"' . $sep;
+					print '"' . ($mt < 0 ? price(-$mt) : '') . '"' . $sep;
+					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+					print '"' . $journal . '"' . $sep;
+					print '"' . dol_string_nohtmltag($ref) . '"' . $sep;
 					print "\n";
 				}
 			}
@@ -1035,21 +1035,21 @@ 
 				if ($mt) {
 					$reflabel = '';
 					if (!empty($val['lib'])) {
-						$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+						$reflabel .= dol_string_nohtmltag($val['lib']) . " - ";
 					}
 					$reflabel .= dol_string_nohtmltag('WaitingAccount');
 
-					print '"'.$key.'"'.$sep;
-					print '"'.$date.'"'.$sep;
-					print '"'.$val["type_payment"].'"'.$sep;
-					print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE')).'"'.$sep;
-					print '"'.length_accounta(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE')).'"'.$sep;
+					print '"' . $key . '"' . $sep;
+					print '"' . $date . '"' . $sep;
+					print '"' . $val["type_payment"] . '"' . $sep;
+					print '"' . length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE')) . '"' . $sep;
+					print '"' . length_accounta(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE')) . '"' . $sep;
 					print $sep;
-					print '"'.$reflabel.'"'.$sep;
-					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
-					print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-					print '"'.$journal.'"'.$sep;
-					print '"'.dol_string_nohtmltag($ref).'"'.$sep;
+					print '"' . $reflabel . '"' . $sep;
+					print '"' . ($mt < 0 ? price(-$mt) : '') . '"' . $sep;
+					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+					print '"' . $journal . '"' . $sep;
+					print '"' . dol_string_nohtmltag($ref) . '"' . $sep;
 					print "\n";
 				}
 			}
@@ -1074,23 +1074,23 @@ 
 	$salarystatic = new Salary($db);
 	$variousstatic = new PaymentVarious($db);
 
-	$title = $langs->trans("GenerationOfAccountingEntries").' - '.$accountingjournalstatic->getNomUrl(0, 2, 1, '', 1);
+	$title = $langs->trans("GenerationOfAccountingEntries") . ' - ' . $accountingjournalstatic->getNomUrl(0, 2, 1, '', 1);
 
 	llxHeader('', dol_string_nohtmltag($title));
 
 	$nom = $title;
 	$builddate = dol_now();
 	//$description = $langs->trans("DescFinanceJournal") . '<br>';
-	$description = $langs->trans("DescJournalOnlyBindedVisible").'<br>';
+	$description = $langs->trans("DescJournalOnlyBindedVisible") . '<br>';
 
 	$listofchoices = array(
 		'notyet' => $langs->trans("NotYetInGeneralLedger"),
 		'already' => $langs->trans("AlreadyInGeneralLedger")
 	);
-	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
-	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0) . ' - ' . $form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
+	$period .= ' -  ' . $langs->trans("JournalizationInLedgerStatus") . ' ' . $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
-	$varlink = 'id_journal='.$id_journal;
+	$varlink = 'id_journal=' . $id_journal;
 	$periodlink = '';
 	$exportlink = '';
 
@@ -1101,14 +1101,14 @@ 
 	if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') != 'blockedonclosed') {
 		// Test that setup is complete (we are in accounting, so test on entity is always on $conf->entity only, no sharing allowed)
 		// Fiscal period test
-		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE entity = ".((int) $conf->entity);
+		$sql = "SELECT COUNT(rowid) as nb FROM " . MAIN_DB_PREFIX . "accounting_fiscalyear WHERE entity = " . ((int) $conf->entity);
 		$resql = $db->query($sql);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			if ($obj->nb == 0) {
-				print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheFiscalPeriodIsNotDefined");
-				$desc = ' : '.$langs->trans("AccountancyAreaDescFiscalPeriod", 4, '{link}');
-				$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("FiscalPeriod").'</strong>', $desc);
+				print '<br><div class="warning">' . img_warning() . ' ' . $langs->trans("TheFiscalPeriodIsNotDefined");
+				$desc = ' : ' . $langs->trans("AccountancyAreaDescFiscalPeriod", 4, '{link}');
+				$desc = str_replace('{link}', '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . "-" . $langs->transnoentitiesnoconv("FiscalPeriod") . '</strong>', $desc);
 				print $desc;
 				print '</div>';
 			}
@@ -1118,14 +1118,14 @@ 
 	}
 
 	// Bank test
-	$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."bank_account WHERE entity = ".((int) $conf->entity)." AND fk_accountancy_journal IS NULL AND clos=0";
+	$sql = "SELECT COUNT(rowid) as nb FROM " . MAIN_DB_PREFIX . "bank_account WHERE entity = " . ((int) $conf->entity) . " AND fk_accountancy_journal IS NULL AND clos=0";
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		if ($obj->nb > 0) {
-			print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
-			$desc = ' : '.$langs->trans("AccountancyAreaDescBank", 6, '{link}');
-			$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>', $desc);
+			print '<br><div class="warning">' . img_warning() . ' ' . $langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
+			$desc = ' : ' . $langs->trans("AccountancyAreaDescBank", 6, '{link}');
+			$desc = str_replace('{link}', '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . "-" . $langs->transnoentitiesnoconv("BankAccounts") . '</strong>', $desc);
 			print $desc;
 			print '</div>';
 		}
@@ -1138,9 +1138,9 @@ 
 	if (getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == '-1'
 		|| getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == '-1'
 		|| getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') == "" || getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') == '-1') {
-		print($desc ? '' : '<br>').'<div class="warning">'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-		$desc = ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '{link}');
-		$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>', $desc);
+		print($desc ? '' : '<br>') . '<div class="warning">' . img_warning() . ' ' . $langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+		$desc = ' : ' . $langs->trans("AccountancyAreaDescMisc", 4, '{link}');
+		$desc = str_replace('{link}', '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . "-" . $langs->transnoentitiesnoconv("MenuDefaultAccounts") . '</strong>', $desc);
 		print $desc;
 		print '</div>';
 	}
@@ -1149,17 +1149,17 @@ 
 	print '<br><div class="tabsAction tabsActionNoBottom centerimp">';
 
 	if (getDolGlobalString('ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL') && $in_bookkeeping == 'notyet') {
-		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+		print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
 	}
 
 	if (getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == '-1'
 		|| getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == '-1') {
-		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
+		print '<input type="button" class="butActionRefused classfortooltip" title="' . dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")) . '" value="' . $langs->trans("WriteBookKeeping") . '" />';
 	} else {
 		if ($in_bookkeeping == 'notyet') {
-			print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
+			print '<input type="button" class="butAction" name="writebookkeeping" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 		} else {
-			print '<a class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+			print '<a class="butActionRefused classfortooltip" name="writebookkeeping">' . $langs->trans("WriteBookKeeping") . '</a>';
 		}
 	}
 
@@ -1191,14 +1191,14 @@ 
 	print '<div class="div-table-responsive">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print "<td>".$langs->trans("Date")."</td>";
-	print "<td>".$langs->trans("Piece").' ('.$langs->trans("ObjectsRef").")</td>";
-	print "<td>".$langs->trans("AccountAccounting")."</td>";
-	print "<td>".$langs->trans("SubledgerAccount")."</td>";
-	print "<td>".$langs->trans("LabelOperation")."</td>";
-	print '<td class="center">'.$langs->trans("PaymentMode")."</td>";
-	print '<td class="right">'.$langs->trans("AccountingDebit")."</td>";
-	print '<td class="right">'.$langs->trans("AccountingCredit")."</td>";
+	print "<td>" . $langs->trans("Date") . "</td>";
+	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("ObjectsRef") . ")</td>";
+	print "<td>" . $langs->trans("AccountAccounting") . "</td>";
+	print "<td>" . $langs->trans("SubledgerAccount") . "</td>";
+	print "<td>" . $langs->trans("LabelOperation") . "</td>";
+	print '<td class="center">' . $langs->trans("PaymentMode") . "</td>";
+	print '<td class="right">' . $langs->trans("AccountingDebit") . "</td>";
+	print '<td class="right">' . $langs->trans("AccountingCredit") . "</td>";
 	print "</tr>\n";
 
 	$r = '';
@@ -1213,29 +1213,29 @@ 
 			if ($mt) {
 				$reflabel = '';
 				if (!empty($val['lib'])) {
-					$reflabel .= $val['lib']." - ";
+					$reflabel .= $val['lib'] . " - ";
 				}
-				$reflabel .= $langs->trans("Bank").' '.$val['bank_account_ref'];
+				$reflabel .= $langs->trans("Bank") . ' ' . $val['bank_account_ref'];
 				if (!empty($val['soclib'])) {
-					$reflabel .= " - ".$val['soclib'];
+					$reflabel .= " - " . $val['soclib'];
 				}
 
 				//var_dump($tabpay[$key]);
-				print '<!-- Bank bank.rowid='.$key.' type='.$tabpay[$key]['type'].' ref='.$tabpay[$key]['ref'].'-->';
+				print '<!-- Bank bank.rowid=' . $key . ' type=' . $tabpay[$key]['type'] . ' ref=' . $tabpay[$key]['ref'] . '-->';
 				print '<tr class="oddeven">';
 
 				// Date
-				print "<td>".$date."</td>";
+				print "<td>" . $date . "</td>";
 
 				// Ref
-				print "<td>".dol_escape_htmltag($ref)."</td>";
+				print "<td>" . dol_escape_htmltag($ref) . "</td>";
 
 				// Ledger account
 				$accounttoshow = length_accountg($k);
 				if (empty($accounttoshow) || $accounttoshow == 'NotDefined') {
-					$accounttoshow = '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
+					$accounttoshow = '<span class="error">' . $langs->trans("BankAccountNotDefined") . '</span>';
 				}
-				print '<td class="maxwidth300" title="'.dol_escape_htmltag(dol_string_nohtmltag($accounttoshow)).'">';
+				print '<td class="maxwidth300" title="' . dol_escape_htmltag(dol_string_nohtmltag($accounttoshow)) . '">';
 				print $accounttoshow;
 				print "</td>";
 
@@ -1251,12 +1251,12 @@ 
 
 				// Label operation
 				print '<td>';
-				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>";
-				print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
-				print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+				print '<td class="center">' . $val["type_payment"] . "</td>";
+				print '<td class="right nowraponall amount">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print '<td class="right nowraponall amount">' . ($mt < 0 ? price(-$mt) : '') . "</td>";
 				print "</tr>";
 
 				$i++;
@@ -1269,22 +1269,22 @@ 
 				if ($mt) {
 					$reflabel = '';
 					if (!empty($val['lib'])) {
-						$reflabel .= $val['lib'].($val['soclib'] ? " - " : "");
+						$reflabel .= $val['lib'] . ($val['soclib'] ? " - " : "");
 					}
 					if ($tabtype[$key] == 'banktransfert') {
-						$reflabel .= $langs->trans('TransitionalAccount').' '.$account_transfer;
+						$reflabel .= $langs->trans('TransitionalAccount') . ' ' . $account_transfer;
 					} else {
 						$reflabel .= $val['soclib'];
 					}
 
-					print '<!-- Thirdparty bank.rowid='.$key.' -->';
+					print '<!-- Thirdparty bank.rowid=' . $key . ' -->';
 					print '<tr class="oddeven">';
 
 					// Date
-					print "<td>".$date."</td>";
+					print "<td>" . $date . "</td>";
 
 					// Ref
-					print "<td>".dol_escape_htmltag($ref)."</td>";
+					print "<td>" . dol_escape_htmltag($ref) . "</td>";
 
 					// Ledger account
 					$account_ledger = $k;
@@ -1315,9 +1315,9 @@ 
 						if ($tabtype[$key] == 'unknown') {
 							// We will accept writing, but into a waiting account
 							if (!getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE') || getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE') == '-1') {
-								$accounttoshow = '<span class="error small">'.$langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking').'</span>';
+								$accounttoshow = '<span class="error small">' . $langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking') . '</span>';
 							} else {
-								$accounttoshow = '<span class="warning small">'.$langs->trans('UnknownAccountForThirdparty', length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE'))).'</span>'; // We will use a waiting account
+								$accounttoshow = '<span class="warning small">' . $langs->trans('UnknownAccountForThirdparty', length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE'))) . '</span>'; // We will use a waiting account
 							}
 						} else {
 							// We will refuse writing
@@ -1340,11 +1340,11 @@ 
 							if ($tabtype[$key] == 'member') {
 								$errorstring = 'MainAccountForSubscriptionPaymentNotDefined';
 							}
-							$accounttoshow = '<span class="error small">'.$langs->trans($errorstring).'</span>';
+							$accounttoshow = '<span class="error small">' . $langs->trans($errorstring) . '</span>';
 						}
 					}
-					print '<td class="maxwidth300" title="'.dol_escape_htmltag(dol_string_nohtmltag($accounttoshow)).'">';
-					print $accounttoshow;	// This is a HTML string
+					print '<td class="maxwidth300" title="' . dol_escape_htmltag(dol_string_nohtmltag($accounttoshow)) . '">';
+					print $accounttoshow; // This is a HTML string
 					print "</td>";
 
 					// Subledger account
@@ -1360,12 +1360,12 @@ 
 								if (!empty($tabcompany[$key]['code_compta'])) {
 									if (in_array($tabtype[$key], array('payment_various', 'payment_salary'))) {
 										// For such case, if subledger is not defined, we won't use subledger accounts.
-										$accounttoshowsubledger = '<span class="warning small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored").'</span>';
+										$accounttoshowsubledger = '<span class="warning small">' . $langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored") . '</span>';
 									} else {
-										$accounttoshowsubledger = '<span class="warning small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'</span>';
+										$accounttoshowsubledger = '<span class="warning small">' . $langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']) . '</span>';
 									}
 								} else {
-									$accounttoshowsubledger = '<span class="error small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking").'</span>';
+									$accounttoshowsubledger = '<span class="error small">' . $langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking") . '</span>';
 								}
 							}
 						} else {
@@ -1373,16 +1373,16 @@ 
 						}
 					}
 					print '<td class="maxwidth300">';
-					print $accounttoshowsubledger;	// This is a html string
+					print $accounttoshowsubledger; // This is a html string
 					print "</td>";
 
-					print "<td>".$reflabel."</td>";
+					print "<td>" . $reflabel . "</td>";
 
-					print '<td class="center">'.$val["type_payment"]."</td>";
+					print '<td class="center">' . $val["type_payment"] . "</td>";
 
-					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+					print '<td class="right nowraponall amount">' . ($mt < 0 ? price(-$mt) : '') . "</td>";
 
-					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+					print '<td class="right nowraponall amount">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 
 					print "</tr>";
 
@@ -1394,14 +1394,14 @@ 
 				if ($mt) {
 					$reflabel = '';
 					if (!empty($val['lib'])) {
-						$reflabel .= $val['lib']." - ";
+						$reflabel .= $val['lib'] . " - ";
 					}
 					$reflabel .= 'WaitingAccount';
 
-					print '<!-- Wait bank.rowid='.$key.' -->';
+					print '<!-- Wait bank.rowid=' . $key . ' -->';
 					print '<tr class="oddeven">';
-					print "<td>".$date."</td>";
-					print "<td>".$ref."</td>";
+					print "<td>" . $date . "</td>";
+					print "<td>" . $ref . "</td>";
 					// Ledger account
 					print "<td>";
 					/*if (empty($accounttoshow) || $accounttoshow == 'NotDefined')
@@ -1414,10 +1414,10 @@ 
 					// Subledger account
 					print "<td>";
 					print "</td>";
-					print "<td>".dol_escape_htmltag($reflabel)."</td>";
-					print '<td class="center">'.$val["type_payment"]."</td>";
-					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
-					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+					print "<td>" . dol_escape_htmltag($reflabel) . "</td>";
+					print '<td class="center">' . $val["type_payment"] . "</td>";
+					print '<td class="right nowraponall amount">' . ($mt < 0 ? price(-$mt) : '') . "</td>";
+					print '<td class="right nowraponall amount">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 					print "</tr>";
 
 					$i++;
@@ -1428,7 +1428,7 @@ 
 
 	if (!$i) {
 		$colspan = 8;
-		print '<tr class="oddeven"><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+		print '<tr class="oddeven"><td colspan="' . $colspan . '"><span class="opacitymedium">' . $langs->trans("NoRecordFound") . '</span></td></tr>';
 	}
 
 	print "</table>";
@@ -1483,77 +1483,77 @@ 
 	$sqlmid = '';
 	if ($typerecord == 'payment') {
 		if (getDolGlobalInt('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
-			$sqlmid = "SELECT payfac.fk_facture as id, ".$db->ifsql('f1.rowid IS NULL', 'f.ref', 'f1.ref')." as ref";
-			$sqlmid .= " FROM ".$db->prefix()."paiement_facture as payfac";
-			$sqlmid .= " LEFT JOIN ".$db->prefix()."facture as f ON f.rowid = payfac.fk_facture";
-			$sqlmid .= " LEFT JOIN ".$db->prefix()."societe_remise_except as sre ON sre.fk_facture_source = payfac.fk_facture";
-			$sqlmid .= " LEFT JOIN ".$db->prefix()."facture as f1 ON f1.rowid = sre.fk_facture";
-			$sqlmid .= " WHERE payfac.fk_paiement=".((int) $val['paymentid']);
+			$sqlmid = "SELECT payfac.fk_facture as id, " . $db->ifsql('f1.rowid IS NULL', 'f.ref', 'f1.ref') . " as ref";
+			$sqlmid .= " FROM " . $db->prefix() . "paiement_facture as payfac";
+			$sqlmid .= " LEFT JOIN " . $db->prefix() . "facture as f ON f.rowid = payfac.fk_facture";
+			$sqlmid .= " LEFT JOIN " . $db->prefix() . "societe_remise_except as sre ON sre.fk_facture_source = payfac.fk_facture";
+			$sqlmid .= " LEFT JOIN " . $db->prefix() . "facture as f1 ON f1.rowid = sre.fk_facture";
+			$sqlmid .= " WHERE payfac.fk_paiement=" . ((int) $val['paymentid']);
 		} else {
 			$sqlmid = "SELECT payfac.fk_facture as id, f.ref as ref";
-			$sqlmid .= " FROM ".$db->prefix()."paiement_facture as payfac";
-			$sqlmid .= " INNER JOIN ".$db->prefix()."facture as f ON f.rowid = payfac.fk_facture";
-			$sqlmid .= " WHERE payfac.fk_paiement=".((int) $val['paymentid']);
+			$sqlmid .= " FROM " . $db->prefix() . "paiement_facture as payfac";
+			$sqlmid .= " INNER JOIN " . $db->prefix() . "facture as f ON f.rowid = payfac.fk_facture";
+			$sqlmid .= " WHERE payfac.fk_paiement=" . ((int) $val['paymentid']);
 		}
 		$ref = $langs->transnoentitiesnoconv("Invoice");
 	} elseif ($typerecord == 'payment_supplier') {
 		$sqlmid = 'SELECT payfac.fk_facturefourn as id, f.ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as payfac, ".MAIN_DB_PREFIX."facture_fourn as f";
-		$sqlmid .= " WHERE payfac.fk_facturefourn = f.rowid AND payfac.fk_paiementfourn=".((int) $val["paymentsupplierid"]);
+		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfac, " . MAIN_DB_PREFIX . "facture_fourn as f";
+		$sqlmid .= " WHERE payfac.fk_facturefourn = f.rowid AND payfac.fk_paiementfourn=" . ((int) $val["paymentsupplierid"]);
 		$ref = $langs->transnoentitiesnoconv("SupplierInvoice");
 	} elseif ($typerecord == 'payment_expensereport') {
 		$sqlmid = 'SELECT e.rowid as id, e.ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as pe, ".MAIN_DB_PREFIX."expensereport as e";
-		$sqlmid .= " WHERE pe.rowid=".((int) $val["paymentexpensereport"])." AND pe.fk_expensereport = e.rowid";
+		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_expensereport as pe, " . MAIN_DB_PREFIX . "expensereport as e";
+		$sqlmid .= " WHERE pe.rowid=" . ((int) $val["paymentexpensereport"]) . " AND pe.fk_expensereport = e.rowid";
 		$ref = $langs->transnoentitiesnoconv("ExpenseReport");
 	} elseif ($typerecord == 'payment_salary') {
 		$sqlmid = 'SELECT s.rowid as ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
-		$sqlmid .= " WHERE s.rowid=".((int) $val["paymentsalid"]);
+		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_salary as s";
+		$sqlmid .= " WHERE s.rowid=" . ((int) $val["paymentsalid"]);
 		$ref = $langs->transnoentitiesnoconv("SalaryPayment");
 	} elseif ($typerecord == 'sc') {
 		$sqlmid = 'SELECT sc.rowid as ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementcharge as sc";
-		$sqlmid .= " WHERE sc.rowid=".((int) $val["paymentscid"]);
+		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "paiementcharge as sc";
+		$sqlmid .= " WHERE sc.rowid=" . ((int) $val["paymentscid"]);
 		$ref = $langs->transnoentitiesnoconv("SocialContribution");
 	} elseif ($typerecord == 'payment_vat') {
 		$sqlmid = 'SELECT v.rowid as ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."tva as v";
-		$sqlmid .= " WHERE v.rowid=".((int) $val["paymentvatid"]);
+		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "tva as v";
+		$sqlmid .= " WHERE v.rowid=" . ((int) $val["paymentvatid"]);
 		$ref = $langs->transnoentitiesnoconv("PaymentVat");
 	} elseif ($typerecord == 'payment_donation') {
 		$sqlmid = 'SELECT payd.fk_donation as ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_donation as payd";
-		$sqlmid .= " WHERE payd.fk_donation=".((int) $val["paymentdonationid"]);
+		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_donation as payd";
+		$sqlmid .= " WHERE payd.fk_donation=" . ((int) $val["paymentdonationid"]);
 		$ref = $langs->transnoentitiesnoconv("Donation");
 	} elseif ($typerecord == 'payment_loan') {
 		$sqlmid = 'SELECT l.rowid as ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_loan as l";
-		$sqlmid .= " WHERE l.rowid=".((int) $val["paymentloanid"]);
+		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_loan as l";
+		$sqlmid .= " WHERE l.rowid=" . ((int) $val["paymentloanid"]);
 		$ref = $langs->transnoentitiesnoconv("LoanPayment");
 	} elseif ($typerecord == 'payment_various') {
 		$sqlmid = 'SELECT v.rowid as ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
-		$sqlmid .= " WHERE v.rowid=".((int) $val["paymentvariousid"]);
+		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_various as v";
+		$sqlmid .= " WHERE v.rowid=" . ((int) $val["paymentvariousid"]);
 		$ref = $langs->transnoentitiesnoconv("VariousPayment");
 	}
 	// Add warning
 	if (empty($sqlmid)) {
-		dol_syslog("Found a typerecord=".$typerecord." not supported", LOG_WARNING);
+		dol_syslog("Found a typerecord=" . $typerecord . " not supported", LOG_WARNING);
 	}
 
 	if ($sqlmid) {
-		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=".$sqlmid, LOG_DEBUG);
+		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
 		$resultmid = $db->query($sqlmid);
 		if ($resultmid) {
 			while ($objmid = $db->fetch_object($resultmid)) {
-				$ref .= ' '.$objmid->ref;
+				$ref .= ' ' . $objmid->ref;
 			}
 		} else {
 			dol_print_error($db);
 		}
 	}
 
-	$ref = dol_trunc($langs->transnoentitiesnoconv("BankId").' '.$val['fk_bank'].' - '.$ref, 295); // 295 + 3 dots (...) is < than max size of 300
+	$ref = dol_trunc($langs->transnoentitiesnoconv("BankId") . ' ' . $val['fk_bank'] . ' - ' . $ref, 295); // 295 + 3 dots (...) is < than max size of 300
 	return $ref;
 }

htdocs/accountancy/journal/expensereportsjournal.php

Spacing +1 added lines, -1 removed lines

@@ -381,7 +381,7 @@
 
                 foreach ($arrayofvat[$key] as $k => $mt) {
                     if ($mt) {
-                        $accountingaccount->fetch(null, $k, true);  // TODO Use a cache for label
+                        $accountingaccount->fetch(null, $k, true); // TODO Use a cache for label
                         $account_label = $accountingaccount->label;
 
                         // get compte id and label

htdocs/accountancy/class/accountingaccount.class.php

Spacing +4 added lines, -4 removed lines

@@ -747,7 +747,7 @@ 
         $hookmanager->initHooks(array('accountancyBindingCalculation'));
 
         // Execute hook accountancyBindingCalculation
-        $parameters = array('buyer' => $buyer, 'seller' => $seller, 'product' => $product, 'facture' => $facture, 'factureDet' => $factureDet ,'accountingAccount' => $accountingAccount, 0 => $type);
+        $parameters = array('buyer' => $buyer, 'seller' => $seller, 'product' => $product, 'facture' => $facture, 'factureDet' => $factureDet, 'accountingAccount' => $accountingAccount, 0 => $type);
         $reshook = $hookmanager->executeHooks('accountancyBindingCalculation', $parameters); // Note that $action and $object may have been modified by some hooks
 
         if (empty($reshook)) {
@@ -761,9 +761,9 @@ 
             require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
             $isBuyerInEEC = isInEEC($buyer);
             $isSellerInEEC = isInEEC($seller);
-            $code_l = '';   // Default value for generic product/service
-            $code_p = '';   // Value for the product/service in parameter ($product)
-            $code_t = '';   // Default value of product account for the thirdparty
+            $code_l = ''; // Default value for generic product/service
+            $code_p = ''; // Value for the product/service in parameter ($product)
+            $code_t = ''; // Default value of product account for the thirdparty
             $suggestedid = '';
 
             // Level 1 (define $code_l): Search suggested default account for product/service

htdocs/accountancy/class/accountingjournal.class.php

Spacing +11 added lines, -11 removed lines

@@ -613,12 +613,12 @@ 
                         }
                     } else { // $type == 'csv'
                         $blocks[] = array(
-                            $depreciation_date,                                     // Date
-                            $element_static->ref,                                   // Piece
-                            $account_infos['code_formatted_1'],                     // AccountAccounting
-                            $element_name_formatted_0 . ' - ' . $depreciation_ref,  // LabelOperation
-                            $mt < 0 ? price(-$mt) : '',                             // Debit
-                            $mt >= 0 ? price($mt) : '',                             // Credit
+                            $depreciation_date, // Date
+                            $element_static->ref, // Piece
+                            $account_infos['code_formatted_1'], // AccountAccounting
+                            $element_name_formatted_0 . ' - ' . $depreciation_ref, // LabelOperation
+                            $mt < 0 ? price(-$mt) : '', // Debit
+                            $mt >= 0 ? price($mt) : '', // Credit
                         );
                     }
                 }
@@ -734,12 +734,12 @@ 
                                         }
                                     } else { // $type == 'csv'
                                         $blocks[] = array(
-                                            $disposal_date,                                    // Date
-                                            $element_static->ref,                              // Piece
-                                            $account_infos['code_formatted_1'],                // AccountAccounting
+                                            $disposal_date, // Date
+                                            $element_static->ref, // Piece
+                                            $account_infos['code_formatted_1'], // AccountAccounting
                                             $element_name_formatted_0 . ' - ' . $disposal_ref, // LabelOperation
-                                            $mt < 0 ? price(-$mt) : '',                        // Debit
-                                            $mt >= 0 ? price($mt) : '',                        // Credit
+                                            $mt < 0 ? price(-$mt) : '', // Debit
+                                            $mt >= 0 ? price($mt) : '', // Credit
                                         );
                                     }
                                 }

htdocs/accountancy/class/bookkeeping.class.php

Spacing +1 added lines, -1 removed lines

@@ -1731,7 +1731,7 @@
         $sql = "DELETE";
         $sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element . $mode;
         $sql .= " WHERE piece_num = " . (int) $piecenum;
-        $sql .= " AND date_validated IS NULL";      // For security, exclusion of validated entries at the time of deletion
+        $sql .= " AND date_validated IS NULL"; // For security, exclusion of validated entries at the time of deletion
         $sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
         $sql .= $sql_filter;
 

htdocs/accountancy/class/accountancycategory.class.php

Spacing +1 added lines, -1 removed lines

@@ -639,7 +639,7 @@
         if (is_array($cpt)) {
             $listofaccount = '';
             foreach ($cpt as $cptcursor) {
-                if (! is_null($cptcursor)) {
+                if (!is_null($cptcursor)) {
                     if ($listofaccount) {
                         $listofaccount .= ",";
                     }

htdocs/accountancy/class/accountancyexport.class.php

Spacing +4 added lines, -4 removed lines

@@ -335,8 +335,8 @@ 
      */
     public function export(&$TData, $formatexportset, $withAttachment = 0, $downloadMode = 0, $outputMode = 0, $noouput = 0)
     {
-        global $db, $conf, $langs;  // The tpl file use $db
-        global $search_date_end;    // Used into /accountancy/tpl/export_journal.tpl.php
+        global $db, $conf, $langs; // The tpl file use $db
+        global $search_date_end; // Used into /accountancy/tpl/export_journal.tpl.php
 
         // Define name of file to save
         $filename = 'general_ledger-' . $this->getFormatCode($formatexportset);
@@ -2001,7 +2001,7 @@ 
             // MOPM
             $tab[] = "";
             // BONP
-            $tab[] =  "";
+            $tab[] = "";
             // BQAF
             $tab[] = "";
             // ECES
@@ -2207,7 +2207,7 @@ 
                 }
             } elseif ($line->doc_type == 'customer_invoice') {
                 if (($line->amount) < 0) {
-                    $nature_piece = 'AC';       // Currently, only the sign of amount allows to know the type of invoice (standard or credit note). Other solution is to analyse debit/credit/role of account. TODO Add column doc_type_long or make amount mandatory with rule on sign.
+                    $nature_piece = 'AC'; // Currently, only the sign of amount allows to know the type of invoice (standard or credit note). Other solution is to analyse debit/credit/role of account. TODO Add column doc_type_long or make amount mandatory with rule on sign.
                 } else {
                     $nature_piece = 'FC';
                 }

htdocs/accountancy/customer/list.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 $search_date_endday = GETPOSTINT('search_date_endday');
 $search_date_endmonth = GETPOSTINT('search_date_endmonth');
 $search_date_endyear = GETPOSTINT('search_date_endyear');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);   // Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
@@ -566,14 +566,14 @@ 
         $thirdpartystatic->client = $objp->client;
         $thirdpartystatic->fournisseur = $objp->fournisseur;
         $thirdpartystatic->code_client = $objp->code_client;
-        $thirdpartystatic->code_compta = $objp->code_compta_client;     // For backward compatibility
+        $thirdpartystatic->code_compta = $objp->code_compta_client; // For backward compatibility
         $thirdpartystatic->code_compta_client = $objp->code_compta_client;
         $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
         $thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
         $thirdpartystatic->email = $objp->email;
         $thirdpartystatic->country_code = $objp->country_code;
         $thirdpartystatic->tva_intra = $objp->tva_intra;
-        $thirdpartystatic->code_compta_product = $objp->company_code_sell;      // The accounting account for product stored on thirdparty object (for level3 suggestion)
+        $thirdpartystatic->code_compta_product = $objp->company_code_sell; // The accounting account for product stored on thirdparty object (for level3 suggestion)
 
         $product_static->ref = $objp->product_ref;
         $product_static->id = $objp->product_id;

htdocs/accountancy/customer/index.php

Spacing +6 added lines, -6 removed lines

@@ -141,9 +141,9 @@ 
     $sql .= " co.code as country_code, co.label as country_label,";
     $sql .= " s.tva_intra,";
     if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-        $sql .= " spe.accountancy_code_sell as company_code_sell";  // accounting code for product but stored on thirdparty
+        $sql .= " spe.accountancy_code_sell as company_code_sell"; // accounting code for product but stored on thirdparty
     } else {
-        $sql .= " s.accountancy_code_sell as company_code_sell";    // accounting code for product but stored on thirdparty
+        $sql .= " s.accountancy_code_sell as company_code_sell"; // accounting code for product but stored on thirdparty
     }
     $sql .= " FROM " . $db->prefix() . "facture as f";
     $sql .= " INNER JOIN " . $db->prefix() . "societe as s ON s.rowid = f.fk_soc";
@@ -151,7 +151,7 @@ 
         $sql .= " LEFT JOIN " . $db->prefix() . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
     }
     $sql .= " LEFT JOIN " . $db->prefix() . "c_country as co ON co.rowid = s.fk_pays ";
-    $sql .= " INNER JOIN " . $db->prefix() . "facturedet as l ON f.rowid = l.fk_facture";   // the main table
+    $sql .= " INNER JOIN " . $db->prefix() . "facturedet as l ON f.rowid = l.fk_facture"; // the main table
     $sql .= " LEFT JOIN " . $db->prefix() . "product as p ON p.rowid = l.fk_product";
     if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
         $sql .= " LEFT JOIN " . $db->prefix() . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
@@ -205,7 +205,7 @@ 
             $thirdpartystatic->email = !empty($objp->email) ? $objp->email : "";
             $thirdpartystatic->country_code = !empty($objp->country_code) ? $objp->country_code : "";
             $thirdpartystatic->tva_intra = !empty($objp->tva_intra) ? $objp->tva_intra : "";
-            $thirdpartystatic->code_compta_product = !empty($objp->company_code_sell) ? $objp->company_code_sell : "";      // The accounting account for product stored on thirdparty object (for level3 suggestion)
+            $thirdpartystatic->code_compta_product = !empty($objp->company_code_sell) ? $objp->company_code_sell : ""; // The accounting account for product stored on thirdparty object (for level3 suggestion)
 
             $product_static->ref = $objp->product_ref;
             $product_static->id = $objp->product_id;
@@ -672,7 +672,7 @@ 
                     "MONTH(f.datef) = " . ((int) $j),
                     " (" . $db->ifsql(
                                 "fd.total_ht < 0",
-                                " (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",   // TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
+                                " (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))", // TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
                                 "  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))"
                             ) . ")",
                     0
@@ -680,7 +680,7 @@ 
             }
             $sql .= "  SUM(" . $db->ifsql(
                 "fd.total_ht < 0",
-                " (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",   // TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
+                " (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))", // TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
                                 "  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))"
             ) . ") as total";
         } else {