Dolibarr / dolibarr

htdocs/projet/tasks.php

Spacing +10 added lines, -10 removed lines

@@ -51,7 +51,7 @@ 
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'projecttasklist';
-$backtopage = GETPOST('backtopage', 'alpha');					// if not set, a default page will be used
+$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used
 //$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');	// if not set, $backtopage will be used
 //$backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
 $optioncss  = GETPOST('optioncss', 'aZ');
@@ -93,20 +93,20 @@ 
 $search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth');
 $search_date_start_startyear = GETPOSTINT('search_date_start_startyear');
 $search_date_start_startday = GETPOSTINT('search_date_start_startday');
-$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear);	// Use tzserver
+$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver
 $search_date_start_endmonth = GETPOSTINT('search_date_start_endmonth');
 $search_date_start_endyear = GETPOSTINT('search_date_start_endyear');
 $search_date_start_endday = GETPOSTINT('search_date_start_endday');
-$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear);	// Use tzserver
+$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver
 
 $search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth');
 $search_date_end_startyear = GETPOSTINT('search_date_end_startyear');
 $search_date_end_startday = GETPOSTINT('search_date_end_startday');
-$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear);	// Use tzserver
+$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver
 $search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth');
 $search_date_end_endyear = GETPOSTINT('search_date_end_endyear');
 $search_date_end_endday = GETPOSTINT('search_date_end_endday');
-$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear);	// Use tzserver
+$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver
 
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
@@ -184,7 +184,7 @@ 
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 
@@ -540,7 +540,7 @@ 
 		$param .= '&search_date_end_endday='.urlencode((string) ($search_date_end_endday));
 	}
 	if ($search_date_end_end) {
-		$param .= '&search_date_end_end=' . urlencode($search_date_end_end);
+		$param .= '&search_date_end_end='.urlencode($search_date_end_end);
 	}
 	if ($search_planedworkload) {
 		$param .= '&search_planedworkload='.urlencode($search_planedworkload);
@@ -580,7 +580,7 @@ 
 	if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['project'])) {
 		$tmpurl = $_SESSION['pageforbacktolist']['project'];
 		$tmpurl = preg_replace('/__SOCID__/', (string) $object->socid, $tmpurl);
-		$linkback = '<a href="'.$tmpurl.(preg_match('/\?/', $tmpurl) ? '&' : '?'). 'restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.$tmpurl.(preg_match('/\?/', $tmpurl) ? '&' : '?').'restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	} else {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
@@ -745,8 +745,8 @@ 
 
 	$defaultref = '';
 	$obj = getDolGlobalString('PROJECT_TASK_ADDON', 'mod_task_simple');
-	if (getDolGlobalString('PROJECT_TASK_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON').".php")) {
-		require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON').'.php';
+	if (getDolGlobalString('PROJECT_TASK_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".getDolGlobalString('PROJECT_TASK_ADDON').".php")) {
+		require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".getDolGlobalString('PROJECT_TASK_ADDON').'.php';
 		$modTask = new $obj();
 		$defaultref = $modTask->getNextValue($object->thirdparty, null);
 	}

htdocs/projet/card.php

Spacing +17 added lines, -17 removed lines

@@ -111,7 +111,7 @@ 
 
 $permissiontoadd = $user->hasRight('projet', 'creer');
 $permissiontodelete = $user->hasRight('projet', 'supprimer');
-$permissiondellink = $user->hasRight('projet', 'creer');	// Used by the include of actions_dellink.inc.php
+$permissiondellink = $user->hasRight('projet', 'creer'); // Used by the include of actions_dellink.inc.php
 
 
 /*
@@ -162,7 +162,7 @@ 
 		$action = '';
 	}
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be 'include', not 'include_once'
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once'
 
 	// Action setdraft object
 	if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd) {
@@ -322,7 +322,7 @@ 
 			$object->date_end_event   = (!GETPOST('date_end_event')) ? '' : $date_end_event;
 			$object->location     = $location;
 			if (GETPOSTISSET('opp_amount')) {
-				$object->opp_amount   = price2num(GETPOST('opp_amount', 'alpha'));
+				$object->opp_amount = price2num(GETPOST('opp_amount', 'alpha'));
 			}
 			if (GETPOSTISSET('budget_amount')) {
 				$object->budget_amount = price2num(GETPOST('budget_amount', 'alpha'));
@@ -510,7 +510,7 @@ 
 			if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['project'])) {
 				$tmpurl = $_SESSION['pageforbacktolist']['project'];
 				$tmpurl = preg_replace('/__SOCID__/', (string) $object->socid, $tmpurl);
-				$urlback = $tmpurl.(preg_match('/\?/', $tmpurl) ? '&' : '?'). 'restore_lastsearch_values=1';
+				$urlback = $tmpurl.(preg_match('/\?/', $tmpurl) ? '&' : '?').'restore_lastsearch_values=1';
 			} else {
 				$urlback = DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1';
 			}
@@ -1071,7 +1071,7 @@ 
 				print '<br>';
 			}
 			if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
-				print '<input type="checkbox" id="usage_task" name="usage_task"' . (GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')) . '> ';
+				print '<input type="checkbox" id="usage_task" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'> ';
 				$htmltext = $langs->trans("ProjectFollowTasks");
 				print '<label for="usage_task">'.$form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext).'</label>';
 				print '<script>';
@@ -1097,7 +1097,7 @@ 
 				print '<br>';
 			}
 			if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
-				print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"' . (GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')) . '> ';
+				print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'> ';
 				$htmltext = $langs->trans("ProjectBillTimeDescription");
 				print '<label for="usage_bill_time">'.$form->textwithpicto($langs->trans("BillTime"), $htmltext).'</label>';
 				print '<script>';
@@ -1123,7 +1123,7 @@ 
 				print '<br>';
 			}
 			if (isModEnabled('eventorganization')) {
-				print '<input type="checkbox" id="usage_organize_event" name="usage_organize_event"'. (GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')) . '> ';
+				print '<input type="checkbox" id="usage_organize_event" name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'> ';
 				$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 				print '<label for="usage_organize_event">'.$form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext).'</label>';
 				print '<script>';
@@ -1302,7 +1302,7 @@ 
 		if (!empty($_SESSION['pageforbacktolist']) && !empty($_SESSION['pageforbacktolist']['project'])) {
 			$tmpurl = $_SESSION['pageforbacktolist']['project'];
 			$tmpurl = preg_replace('/__SOCID__/', (string) $object->socid, $tmpurl);
-			$linkback = '<a href="'.$tmpurl.(preg_match('/\?/', $tmpurl) ? '&' : '?'). 'restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+			$linkback = '<a href="'.$tmpurl.(preg_match('/\?/', $tmpurl) ? '&' : '?').'restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 		} else {
 			$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 		}
@@ -1390,8 +1390,8 @@ 
 				print '<a class="editfielda paddingtop" href="'.$_SERVER["PHP_SELF"].'?action=edit_opp_status&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a>';
 			}
 			print '</td><td>';
-			$html_name_status 	= ($action == 'edit_opp_status') ? 'opp_status' : 'none';
-			$html_name_percent 	= ($action == 'edit_opp_status') ? 'opp_percent' : 'none';
+			$html_name_status = ($action == 'edit_opp_status') ? 'opp_status' : 'none';
+			$html_name_percent = ($action == 'edit_opp_status') ? 'opp_percent' : 'none';
 			$percent_value = (GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ? vatrate($object->opp_percent) : ''));
 			$formproject->formOpportunityStatus($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->opp_status, $percent_value, $html_name_status, $html_name_percent);
 			print '</td></tr>';
@@ -1602,7 +1602,7 @@ 
 					if ($userWrite > 0) {
 						print dolGetButtonAction('', $langs->trans('SetToDraft'), 'default', $_SERVER["PHP_SELF"].'?action=confirm_setdraft&amp;confirm=yes&amp;token='.newToken().'&amp;id='.$object->id, '');
 					} else {
-						print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('SetToDraft'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
+						print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('SetToDraft'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 					}
 				}
 			}
@@ -1612,7 +1612,7 @@ 
 				if ($userWrite > 0) {
 					print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id, '');
 				} else {
-					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Modify'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
+					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Modify'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 				}
 			}
 
@@ -1621,7 +1621,7 @@ 
 				if ($userWrite > 0) {
 					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=validate&amp;token='.newToken().'&amp;id='.$object->id, '');
 				} else {
-					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
+					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 				}
 			}
 
@@ -1630,7 +1630,7 @@ 
 				if ($userWrite > 0) {
 					print dolGetButtonAction('', $langs->trans('Close'), 'default', $_SERVER["PHP_SELF"].'?action=close&amp;token='.newToken().'&amp;id='.$object->id, '');
 				} else {
-					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Close'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
+					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Close'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 				}
 			}
 
@@ -1639,7 +1639,7 @@ 
 				if ($userWrite > 0) {
 					print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&amp;token='.newToken().'&amp;id='.$object->id, '');
 				} else {
-					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('ReOpen'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
+					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('ReOpen'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 				}
 			}
 
@@ -1668,7 +1668,7 @@ 
 				if ($userWrite > 0) {
 					print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER["PHP_SELF"].'?action=clone&token='.newToken().'&id='.((int) $object->id), '');
 				} else {
-					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
+					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 				}
 			}
 
@@ -1677,7 +1677,7 @@ 
 				if ($userDelete > 0 || ($object->status == Project::STATUS_DRAFT && $user->hasRight('projet', 'creer'))) {
 					print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id, '');
 				} else {
-					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Delete'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
+					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Delete'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 				}
 			}
 		}

htdocs/takepos/invoice.php

Spacing +26 added lines, -26 removed lines

@@ -171,7 +171,7 @@ 
  */
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -186,9 +186,9 @@ 
 			$bankaccount = GETPOSTINT('accountid');
 		} else {
 			if ($pay == 'LIQ') {
-				$bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]);            // For backward compatibility
+				$bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]); // For backward compatibility
 			} elseif ($pay == "CHQ") {
-				$bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]);    // For backward compatibility
+				$bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]); // For backward compatibility
 			} else {
 				$accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"];
 				$bankaccount = getDolGlobalInt($accountname);
@@ -253,10 +253,10 @@ 
 			$savconst = getDolGlobalString('STOCK_CALCULATE_ON_BILL');
 
 			if (isModEnabled('productbatch') && !getDolGlobalInt('CASHDESK_FORCE_DECREASE_STOCK')) {
-				$conf->global->STOCK_CALCULATE_ON_BILL = 0;	// To not change the stock (this will be done later)
+				$conf->global->STOCK_CALCULATE_ON_BILL = 0; // To not change the stock (this will be done later)
 			} else {
 				// Deprecated: CASHDESK_FORCE_DECREASE_STOCK is now always false. No more required/used.
-				$conf->global->STOCK_CALCULATE_ON_BILL = 1;	// To force the change of stock
+				$conf->global->STOCK_CALCULATE_ON_BILL = 1; // To force the change of stock
 			}
 
 			$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
@@ -332,7 +332,7 @@ 
 		// Update stock for batch products
 		if (!$error && $res >= 0) {
 			if (isModEnabled('stock') && isModEnabled('productbatch')) {	// The case !isModEnabled('productbatch') was processed few lines before.
-				require_once DOL_DOCUMENT_ROOT . "/product/stock/class/mouvementstock.class.php";
+				require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php";
 				$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
 				$inventorycode = dol_print_date(dol_now(), 'dayhourlog');
 				$labeltakeposmovement = 'TakePOS - '.$langs->trans("Invoice").' '.$invoice->ref;
@@ -377,7 +377,7 @@ 
 		$creditnote->socid = $invoice->socid;
 		$creditnote->date = dol_now();
 		$creditnote->module_source = 'takepos';
-		$creditnote->pos_source =  isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ;
+		$creditnote->pos_source = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '';
 		$creditnote->type = Facture::TYPE_CREDIT_NOTE;
 		$creditnote->fk_facture_source = $placeid;
 		//$creditnote->remise_absolue = $invoice->remise_absolue;
@@ -536,10 +536,10 @@ 
 		$invoice->socid = getDolGlobalInt($constforcompanyid);
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-		$invoice->date = dol_get_first_hour(dol_now('tzuserrel'));		// Invoice::create() needs a date with no hours
+		$invoice->date = dol_get_first_hour(dol_now('tzuserrel')); // Invoice::create() needs a date with no hours
 
 		$invoice->module_source = 'takepos';
-		$invoice->pos_source =  isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ;
+		$invoice->pos_source = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '';
 		$invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity;
 
 		if ($invoice->socid <= 0) {
@@ -749,7 +749,7 @@ 
 
 			// complete line by hook
 			$parameters = array('prod' => $prod, 'line' => $line);
-			$reshook = $hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action);    // Note that $action and $line may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action); // Note that $action and $line may have been modified by some hooks
 			if ($reshook < 0) {
 				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 			}
@@ -944,7 +944,7 @@ 
 					}
 					if (!$permissiontoupdateline) {
 						dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos").' - No permission to updateprice', null, 1);
-					} elseif (getDolGlobalInt('TAKEPOS_CHANGE_PRICE_HT')  == 1) {
+					} elseif (getDolGlobalInt('TAKEPOS_CHANGE_PRICE_HT') == 1) {
 						$result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 					} else {
 						$result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
@@ -1008,7 +1008,7 @@ 
 
 	if ($action == "setbatch" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
 		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-		$warehouseid = getDolGlobalInt($constantforkey);	// TODO Get the wrehouse id from GETPOSTINT('warehouseid');
+		$warehouseid = getDolGlobalInt($constantforkey); // TODO Get the wrehouse id from GETPOSTINT('warehouseid');
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET batch = '".$db->escape($batch)."', fk_warehouse = ".((int) $warehouseid);
 		$sql .= " WHERE rowid=".((int) $idoflineadded);
 		$db->query($sql);
@@ -1156,7 +1156,7 @@ 
 
 		$sectionwithinvoicelink .= '</span><br>';
 		if (getDolGlobalInt('TAKEPOS_PRINT_INVOICE_DOC_INSTEAD_OF_RECEIPT')) {
-			$sectionwithinvoicelink .= ' <a target="_blank" class="button" href="' . DOL_URL_ROOT . '/document.php?token=' . newToken() . '&modulepart=facture&file=' . $invoice->ref . '/' . $invoice->ref . '.pdf">Invoice</a>';
+			$sectionwithinvoicelink .= ' <a target="_blank" class="button" href="'.DOL_URL_ROOT.'/document.php?token='.newToken().'&modulepart=facture&file='.$invoice->ref.'/'.$invoice->ref.'.pdf">Invoice</a>';
 		} elseif (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {
 			if (getDolGlobalString('TAKEPOS_PRINT_SERVER') && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
 				$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposConnector('.$placeid.')">'.$langs->trans('PrintTicket').'</button>';
@@ -1195,7 +1195,7 @@ 
 if ((getDolGlobalString('TAKEPOS_PHONE_BASIC_LAYOUT') == 1 && $conf->browser->layout == 'phone') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
 	if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
-		$title = 'TakePOS - ' . getDolGlobalString('MAIN_APPLICATION_TITLE');
+		$title = 'TakePOS - '.getDolGlobalString('MAIN_APPLICATION_TITLE');
 	}
 	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
 	<meta name="apple-mobile-web-app-capable" content="yes">
@@ -1420,7 +1420,7 @@ 
 			if ($contactid > 0) {
 				$contact = new Contact($db);
 				$contact->fetch($contactid);
-				$s .= " - " . $contact->getFullName($langs);
+				$s .= " - ".$contact->getFullName($langs);
 			}
 		}
 	}
@@ -1481,10 +1481,10 @@ 
 	$s = '';
 
 	$idwarehouse = 0;
-	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
+	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
 	if (isModEnabled('stock')) {
 		if (getDolGlobalString($constantforkey) != "1") {
-			$constantforkey = 'CASHDESK_ID_WAREHOUSE'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
+			$constantforkey = 'CASHDESK_ID_WAREHOUSE'.(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
 			$idwarehouse = getDolGlobalString($constantforkey);
 			if ($idwarehouse > 0) {
 				$s = '<span class="small">';
@@ -1632,7 +1632,7 @@ 
 
 // Complete header by hook
 $parameters = array();
-$reshook = $hookmanager->executeHooks('completeTakePosInvoiceHeader', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('completeTakePosInvoiceHeader', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -1646,16 +1646,16 @@ 
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 	if (getDolGlobalString('TAKEPOS_SHOW_HT')) {
 		print '<td class="linecolht right nowraponall">';
-		print '<span class="opacitymedium small">' . $langs->trans('TotalHTShort') . '</span><br>';
+		print '<span class="opacitymedium small">'.$langs->trans('TotalHTShort').'</span><br>';
 		// In phone version only show when it is invoice page
 		if (empty($mobilepage) || $mobilepage == "invoice") {
-			print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">' . price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency) . '</span>';
+			print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">'.price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency).'</span>';
 			if (isModEnabled('multicurrency') && !empty($_SESSION["takeposcustomercurrency"]) && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
 				//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
-				include_once DOL_DOCUMENT_ROOT . '/multicurrency/class/multicurrency.class.php';
+				include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 				$multicurrency = new MultiCurrency($db);
 				$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
-				print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">(' . price($invoice->total_ht * $multicurrency->rate->rate) . ' ' . $_SESSION["takeposcustomercurrency"] . ')</span>';
+				print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($invoice->total_ht * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';
 			}
 		}
 		print '</td>';
@@ -1799,7 +1799,7 @@ 
 
 				// complete line by hook
 				$parameters = array('line' => $line);
-				$reshook = $hookmanager->executeHooks('completeTakePosInvoiceParentLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('completeTakePosInvoiceParentLine', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
 					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				}
@@ -1854,7 +1854,7 @@ 
 					}
 				}
 				if (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 1) {
-					$htmlforlines .= $form->textwithpicto($line->product_label ? '<b>' . $line->product_ref . '</b> - ' . $line->product_label : dolGetFirstLineOfText($line->desc, 1), $tooltiptext);
+					$htmlforlines .= $form->textwithpicto($line->product_label ? '<b>'.$line->product_ref.'</b> - '.$line->product_label : dolGetFirstLineOfText($line->desc, 1), $tooltiptext);
 				} elseif (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 2) {
 					$htmlforlines .= $form->textwithpicto($line->product_ref ? '<b>'.$line->product_ref.'<b>' : dolGetFirstLineOfText($line->desc, 1), $tooltiptext);
 				} else {
@@ -1912,7 +1912,7 @@ 
 
 				// complete line by hook
 				$parameters = array('line' => $line);
-				$reshook = $hookmanager->executeHooks('completeTakePosInvoiceLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('completeTakePosInvoiceLine', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
 					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				}
@@ -2018,7 +2018,7 @@ 
 if (($action == "valid" || $action == "history") && $invoice->type != Facture::TYPE_CREDIT_NOTE && !getDolGlobalString('TAKEPOS_NO_CREDITNOTE')) {
 	print '<button id="buttonprint" type="button" onclick="ModalBox(\'ModalCreditNote\')">'.$langs->trans('CreateCreditNote').'</button>';
 	if (getDolGlobalInt('TAKEPOS_PRINT_INVOICE_DOC_INSTEAD_OF_RECEIPT')) {
-		print ' <a target="_blank" class="button" href="' . DOL_URL_ROOT . '/document.php?token=' . newToken() . '&modulepart=facture&file=' . $invoice->ref . '/' . $invoice->ref . '.pdf">Invoice</a>';
+		print ' <a target="_blank" class="button" href="'.DOL_URL_ROOT.'/document.php?token='.newToken().'&modulepart=facture&file='.$invoice->ref.'/'.$invoice->ref.'.pdf">Invoice</a>';
 	}
 }
 

htdocs/public/project/new.php

Spacing +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
 
 	if (getDolGlobalString('PROJECT_IMAGE_PUBLIC_NEWLEAD')) {
 		print '<div class="backimagepublicnewlead">';
-		print '<img id="idPROJECT_IMAGE_PUBLIC_NEWLEAD" src="' . getDolGlobalString('PROJECT_IMAGE_PUBLIC_NEWLEAD').'">';
+		print '<img id="idPROJECT_IMAGE_PUBLIC_NEWLEAD" src="'.getDolGlobalString('PROJECT_IMAGE_PUBLIC_NEWLEAD').'">';
 		print '</div>';
 	}
 
@@ -221,7 +221,7 @@ 
 		} else {
 			// Create the prospect
 			if (GETPOST('societe')) {
-				$thirdparty->name =  GETPOST('societe');
+				$thirdparty->name = GETPOST('societe');
 				$thirdparty->name_alias = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
 			} else {
 				$thirdparty->name = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
@@ -548,7 +548,7 @@ 
 }
 
 // Other attributes
-$parameters['tpl_context'] = 'public';	// define template context to public
+$parameters['tpl_context'] = 'public'; // define template context to public
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 // Comments
 print '<tr>';

htdocs/asset/class/asset.class.php

Spacing +67 added lines, -67 removed lines

@@ -51,8 +51,8 @@ 
 	 */
 	public $picto = 'asset';
 
-	const STATUS_DRAFT = 0; 	// In progress
-	const STATUS_DISPOSED = 9;	// Disposed
+	const STATUS_DRAFT = 0; // In progress
+	const STATUS_DISPOSED = 9; // Disposed
 
 	/**
 	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
@@ -518,11 +518,11 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if (empty($this->fk_asset_model)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetModel") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetModel").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -533,7 +533,7 @@ 
 
 		// Get depreciation options
 		//---------------------------
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 		$options_model = new AssetDepreciationOptions($this->db);
 		$result = $options_model->fetchDeprecationOptions(0, $this->fk_asset_model);
 		if ($result < 0) {
@@ -568,7 +568,7 @@ 
 		// Get accountancy codes
 		//---------------------------
 		if (!$error) {
-			require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/asset/class/assetaccountancycodes.class.php';
 			$accountancy_codes_model = new AssetAccountancyCodes($this->db);
 			$result = $accountancy_codes_model->fetchAccountancyCodes(0, $this->fk_asset_model);
 			if ($result < 0) {
@@ -627,7 +627,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -650,15 +650,15 @@ 
 		*/
 
 		$sql = "SELECT ad.rowid, ad.depreciation_mode, ad.ref, ad.depreciation_date, ad.depreciation_ht, ad.cumulative_depreciation_ht";
-		$sql .= ", " . $this->db->ifsql('iab.fk_docdet IS NOT NULL', 1, 0) . " AS bookkeeping";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
-		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
-		$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
+		$sql .= ", ".$this->db->ifsql('iab.fk_docdet IS NOT NULL', 1, 0)." AS bookkeeping";
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation AS ad";
+		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
+		$sql .= " WHERE ad.fk_asset = ".(int) $this->id;
 		$sql .= " ORDER BY ad.depreciation_date ASC";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines').': '.$this->db->lasterror();
 			return -1;
 		}
 
@@ -695,7 +695,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -717,14 +717,14 @@ 
 		*/
 
 		$sql = "SELECT COUNT(*) AS has_bookkeeping";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
-		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
-		$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation AS ad";
+		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
+		$sql .= " WHERE ad.fk_asset = ".(int) $this->id;
 		$sql .= " AND iab.fk_docdet IS NOT NULL";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines').': '.$this->db->lasterror();
 			return -1;
 		}
 
@@ -762,28 +762,28 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
 			return -1;
 		}
 
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "asset_depreciation(fk_asset, depreciation_mode, ref, depreciation_date, depreciation_ht, cumulative_depreciation_ht, accountancy_code_debit, accountancy_code_credit)";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."asset_depreciation(fk_asset, depreciation_mode, ref, depreciation_date, depreciation_ht, cumulative_depreciation_ht, accountancy_code_debit, accountancy_code_credit)";
 		$sql .= " VALUES ( ";
-		$sql .= " " . (int) $this->id;
-		$sql .= ", '" . $this->db->escape($mode) . "'";
-		$sql .= ", '" . $this->db->escape($ref) . "'";
-		$sql .= ", '" . $this->db->idate($depreciation_date) . "'";
-		$sql .= ", " . (float) $depreciation_ht;
-		$sql .= ", " . (float) $cumulative_depreciation_ht;
-		$sql .= ", '" . $this->db->escape($accountancy_code_debit) . "'";
-		$sql .= ", '" . $this->db->escape($accountancy_code_credit) . "'";
+		$sql .= " ".(int) $this->id;
+		$sql .= ", '".$this->db->escape($mode)."'";
+		$sql .= ", '".$this->db->escape($ref)."'";
+		$sql .= ", '".$this->db->idate($depreciation_date)."'";
+		$sql .= ", ".(float) $depreciation_ht;
+		$sql .= ", ".(float) $cumulative_depreciation_ht;
+		$sql .= ", '".$this->db->escape($accountancy_code_debit)."'";
+		$sql .= ", '".$this->db->escape($accountancy_code_credit)."'";
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorAddDepreciationLine') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorAddDepreciationLine').': '.$this->db->lasterror();
 			return -1;
 		}
 
@@ -806,7 +806,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($this->id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -815,7 +815,7 @@ 
 
 		// Get depreciation options
 		//---------------------------
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 		$options = new AssetDepreciationOptions($this->db);
 		$result = $options->fetchDeprecationOptions($this->id);
 		if ($result < 0) {
@@ -826,7 +826,7 @@ 
 
 		// Get accountancy codes
 		//---------------------------
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetaccountancycodes.class.php';
 		$accountancy_codes = new AssetAccountancyCodes($this->db);
 		$result = $accountancy_codes->fetchAccountancyCodes($this->id);
 		if ($result < 0) {
@@ -842,20 +842,20 @@ 
 		foreach ($options->deprecation_options as $mode_key => $fields) {
 			$modes[$mode_key] = $this->db->escape($mode_key);
 		}
-		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "asset_depreciation";
-		$sql .= " WHERE fk_asset = " . (int) $this->id;
-		$sql .= " AND depreciation_mode NOT IN ('" . $this->db->sanitize(implode("', '", $modes)) . "')";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."asset_depreciation";
+		$sql .= " WHERE fk_asset = ".(int) $this->id;
+		$sql .= " AND depreciation_mode NOT IN ('".$this->db->sanitize(implode("', '", $modes))."')";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines').': '.$this->db->lasterror();
 			$error++;
 		}
 
 		if (!$error) {
 			// Get fiscal period
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 			$dates = getCurrentPeriodOfFiscalYear($this->db, $conf, $this->date_start > $this->date_acquisition ? $this->date_start : $this->date_acquisition);
 			$init_fiscal_period_start = $dates['date_start'];
 			$init_fiscal_period_end = $dates['date_end'];
@@ -888,17 +888,17 @@ 
 				*/
 
 				$sql = "SELECT ad.depreciation_date, ad.cumulative_depreciation_ht";
-				$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
-				$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
-				$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
-				$sql .= " AND ad.depreciation_mode = '" . $this->db->escape($mode_key) . "'";
+				$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation AS ad";
+				$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
+				$sql .= " WHERE ad.fk_asset = ".(int) $this->id;
+				$sql .= " AND ad.depreciation_mode = '".$this->db->escape($mode_key)."'";
 				$sql .= " AND iab.fk_docdet IS NOT NULL";
 				$sql .= " ORDER BY ad.depreciation_date DESC";
 				$sql .= " LIMIT 1";
 
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = $langs->trans('AssetErrorFetchMaxDepreciationDateForMode', $mode_key) . ': ' . $this->db->lasterror();
+					$this->errors[] = $langs->trans('AssetErrorFetchMaxDepreciationDateForMode', $mode_key).': '.$this->db->lasterror();
 					$error++;
 					break;
 				}
@@ -910,28 +910,28 @@ 
 				}
 
 				// Set last cumulative depreciation
-				$sql = "UPDATE " . MAIN_DB_PREFIX . $options->deprecation_options_fields[$mode_key]['table'];
-				$sql .= " SET total_amount_last_depreciation_ht = " . (empty($last_cumulative_depreciation_ht) ? 0 : $last_cumulative_depreciation_ht);
-				$sql .= " WHERE fk_asset = " . (int) $this->id;
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$options->deprecation_options_fields[$mode_key]['table'];
+				$sql .= " SET total_amount_last_depreciation_ht = ".(empty($last_cumulative_depreciation_ht) ? 0 : $last_cumulative_depreciation_ht);
+				$sql .= " WHERE fk_asset = ".(int) $this->id;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation') . ': ' . $this->db->lasterror();
+					$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation').': '.$this->db->lasterror();
 					$error++;
 					break;
 				}
 
 				// Delete old lines
-				$sql = "DELETE " . MAIN_DB_PREFIX . "asset_depreciation FROM " . MAIN_DB_PREFIX . "asset_depreciation";
-				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab ON ab.doc_type = 'asset' AND ab.fk_docdet = " . MAIN_DB_PREFIX . "asset_depreciation.rowid";
-				$sql .= " WHERE " . MAIN_DB_PREFIX . "asset_depreciation.fk_asset = " . (int) $this->id;
-				$sql .= " AND " . MAIN_DB_PREFIX . "asset_depreciation.depreciation_mode = '" . $this->db->escape($mode_key) . "'";
+				$sql = "DELETE ".MAIN_DB_PREFIX."asset_depreciation FROM ".MAIN_DB_PREFIX."asset_depreciation";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_bookkeeping as ab ON ab.doc_type = 'asset' AND ab.fk_docdet = ".MAIN_DB_PREFIX."asset_depreciation.rowid";
+				$sql .= " WHERE ".MAIN_DB_PREFIX."asset_depreciation.fk_asset = ".(int) $this->id;
+				$sql .= " AND ".MAIN_DB_PREFIX."asset_depreciation.depreciation_mode = '".$this->db->escape($mode_key)."'";
 				$sql .= " AND ab.fk_docdet IS NULL";
 				if ($last_depreciation_date !== "") {
-					$sql .= " AND " . MAIN_DB_PREFIX . "asset_depreciation.ref != ''";
+					$sql .= " AND ".MAIN_DB_PREFIX."asset_depreciation.ref != ''";
 				}
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines') . ': ' . $this->db->lasterror();
+					$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines').': '.$this->db->lasterror();
 					$error++;
 					break;
 				}
@@ -999,7 +999,7 @@ 
 				// TODO fix declaration of $begin_period
 				$first_period_date = isset($begin_period) && $begin_period > $fiscal_period_start ? $begin_period : $fiscal_period_start;
 
-				$ref_date_format = "%Y" . ($fields['duration_type'] == 1 || $fields['duration_type'] == 2 ? '-%m' : '') . ($fields['duration_type'] == 2 ? '-%d' : '');
+				$ref_date_format = "%Y".($fields['duration_type'] == 1 || $fields['duration_type'] == 2 ? '-%m' : '').($fields['duration_type'] == 2 ? '-%d' : '');
 
 				// Loop security
 				$idx_loop = 0;
@@ -1021,9 +1021,9 @@ 
 
 						$period_begin = dol_print_date($fiscal_period_start, $ref_date_format);
 						$period_end = dol_print_date($fiscal_period_end, $ref_date_format);
-						$ref = $period_begin . ($period_begin != $period_end ? ' - ' . $period_end : '');
+						$ref = $period_begin.($period_begin != $period_end ? ' - '.$period_end : '');
 						if ($fiscal_period_start <= $disposal_date && $disposal_date <= $fiscal_period_end) {
-							$ref .= ' - ' . $langs->transnoentitiesnoconv('AssetDisposal');
+							$ref .= ' - '.$langs->transnoentitiesnoconv('AssetDisposal');
 						}
 
 						$begin_date = $fiscal_period_start < $start_date && $start_date <= $fiscal_period_end ? $start_date : $fiscal_period_start;
@@ -1102,7 +1102,7 @@ 
 		// Check parameters
 		$error = 0;
 		if (empty($asset_depreciation_id)) {
-			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetDepreciation") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetDepreciation").' ('.$langs->transnoentitiesnoconv("TechnicalID").')');
 			$error++;
 		}
 		if ($error) {
@@ -1111,28 +1111,28 @@ 
 
 		$this->db->begin();
 
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 		$options = new AssetDepreciationOptions($this->db);
 
 		// Get last depreciation lines save in bookkeeping
 		//-----------------------------------------------------
 		$sql = "SELECT fk_asset, depreciation_mode, cumulative_depreciation_ht";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation";
-		$sql .= " WHERE rowid = " . (int) $asset_depreciation_id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation";
+		$sql .= " WHERE rowid = ".(int) $asset_depreciation_id;
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = $langs->trans('AssetErrorFetchCumulativeDepreciation') . ': ' . $this->db->lasterror();
+			$this->errors[] = $langs->trans('AssetErrorFetchCumulativeDepreciation').': '.$this->db->lasterror();
 			$error++;
 		} else {
 			if ($obj = $this->db->fetch_object($resql)) {
 				$mode_key = $obj->depreciation_mode;
 				if (!empty($options->deprecation_options_fields[$mode_key])) {
-					$sql = "UPDATE " . MAIN_DB_PREFIX . $options->deprecation_options_fields[$mode_key]['table'];
-					$sql .= " SET total_amount_last_depreciation_ht = " . $obj->cumulative_depreciation_ht;
-					$sql .= " WHERE fk_asset = " . (int) $obj->fk_asset;
+					$sql = "UPDATE ".MAIN_DB_PREFIX.$options->deprecation_options_fields[$mode_key]['table'];
+					$sql .= " SET total_amount_last_depreciation_ht = ".$obj->cumulative_depreciation_ht;
+					$sql .= " WHERE fk_asset = ".(int) $obj->fk_asset;
 					$resql = $this->db->query($sql);
 					if (!$resql) {
-						$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation') . ': ' . $this->db->lasterror();
+						$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation').': '.$this->db->lasterror();
 						$error++;
 					}
 				}
@@ -1385,7 +1385,7 @@ 
 			if ($option == 'label') {
 				$name = $this->label;
 			} elseif ($option == 'with_label') {
-				$name .= ' - ' . $this->label;
+				$name .= ' - '.$this->label;
 			}
 			$result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
 		}
@@ -1394,7 +1394,7 @@ 
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
@@ -1530,7 +1530,7 @@ 
 		if (getDolGlobalString('ASSET_ASSET_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('ASSET_ASSET_ADDON') . ".php";
+			$file = getDolGlobalString('ASSET_ASSET_ADDON').".php";
 			$classname = getDolGlobalString('ASSET_ASSET_ADDON');
 
 			// Include file with class

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

Spacing +453 added lines, -453 removed lines

@@ -29,17 +29,17 @@ 
  * \brief      File of withdrawal receipts class
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/paiementfourn.class.php';
-require_once DOL_DOCUMENT_ROOT . '/salaries/class/salary.class.php';
-require_once DOL_DOCUMENT_ROOT . '/salaries/class/paymentsalary.class.php';
-require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT . '/user/class/userbankaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
+require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/userbankaccount.class.php';
 
 
 /**
@@ -104,8 +104,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
 
 
 	/**
@@ -258,7 +258,7 @@ 
 
 		if ($result == 0) {
 			if ($line_id > 0) {
-				$sql = "INSERT INTO " . MAIN_DB_PREFIX . "prelevement (";
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement (";
 				if ($type != 'bank-transfer') {
 					$sql .= "fk_facture";
 				} else {
@@ -271,24 +271,24 @@ 
 				$sql .= ",fk_prelevement_lignes";
 				$sql .= ") VALUES (";
 				$sql .= ((int) $invoice_id);
-				$sql .= ", " . ((int) $line_id);
+				$sql .= ", ".((int) $line_id);
 				$sql .= ")";
 
 				if ($this->db->query($sql)) {
 					$result = 0;
 				} else {
 					$result = -1;
-					$this->errors[] = get_class($this) . "::AddFacture " . $this->db->lasterror;
-					dol_syslog(get_class($this) . "::AddFacture Error $result");
+					$this->errors[] = get_class($this)."::AddFacture ".$this->db->lasterror;
+					dol_syslog(get_class($this)."::AddFacture Error $result");
 				}
 			} else {
 				$result = -2;
-				$this->errors[] = get_class($this) . "::AddFacture linedid Empty";
-				dol_syslog(get_class($this) . "::AddFacture Error $result");
+				$this->errors[] = get_class($this)."::AddFacture linedid Empty";
+				dol_syslog(get_class($this)."::AddFacture Error $result");
 			}
 		} else {
 			$result = -3;
-			dol_syslog(get_class($this) . "::AddFacture Error $result");
+			dol_syslog(get_class($this)."::AddFacture Error $result");
 		}
 
 		return $result;
@@ -311,23 +311,23 @@ 
 	public function addline(&$line_id, $client_id, $client_nom, $amount, $code_banque, $code_guichet, $number, $number_key, $sourcetype = '')
 	{
 		$result = -1;
-		$concat = 0;	// ??? what is this for. Seems not used.
+		$concat = 0; // ??? what is this for. Seems not used.
 
 		if ($concat == 1) {
 			/*
 			 * We aggregate the lines
 			 */
 			$sql = "SELECT rowid";
-			$sql .= " FROM  " . MAIN_DB_PREFIX . "prelevement_lignes";
-			$sql .= " WHERE fk_prelevement_bons = " . ((int) $this->id);
+			$sql .= " FROM  ".MAIN_DB_PREFIX."prelevement_lignes";
+			$sql .= " WHERE fk_prelevement_bons = ".((int) $this->id);
 			if ($sourcetype == 'salary') {
-				$sql .= " AND fk_soc = " . ((int) $client_id);
+				$sql .= " AND fk_soc = ".((int) $client_id);
 			} else {
-				$sql .= " AND fk_user = " . ((int) $client_id);
+				$sql .= " AND fk_user = ".((int) $client_id);
 			}
-			$sql .= " AND code_banque = '" . $this->db->escape($code_banque) . "'";
-			$sql .= " AND code_guichet = '" . $this->db->escape($code_guichet) . "'";
-			$sql .= " AND number = '" . $this->db->escape($number) . "'";
+			$sql .= " AND code_banque = '".$this->db->escape($code_banque)."'";
+			$sql .= " AND code_guichet = '".$this->db->escape($code_guichet)."'";
+			$sql .= " AND number = '".$this->db->escape($number)."'";
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -339,7 +339,7 @@ 
 			/*
 			 * No aggregate
 			 */
-			$sql = "INSERT INTO " . MAIN_DB_PREFIX . "prelevement_lignes (";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_lignes (";
 			$sql .= "fk_prelevement_bons";
 			$sql .= ", fk_soc";
 			$sql .= ", client_nom";
@@ -351,21 +351,21 @@ 
 			$sql .= ($sourcetype == 'salary' ? ", fk_user" : "");
 			$sql .= ") VALUES (";
 			$sql .= $this->id;
-			$sql .= ", " . (($sourcetype != 'salary') ? ((int) $client_id) : "0");	// fk_soc can't be null
-			$sql .= ", '" . $this->db->escape($client_nom) . "'";
-			$sql .= ", " . ((float) price2num($amount));
-			$sql .= ", '" . $this->db->escape($code_banque) . "'";
-			$sql .= ", '" . $this->db->escape($code_guichet) . "'";
-			$sql .= ", '" . $this->db->escape($number) . "'";
-			$sql .= ", '" . $this->db->escape($number_key) . "'";
-			$sql .= (($sourcetype == 'salary') ? ", " . ((int) $client_id) : '');
+			$sql .= ", ".(($sourcetype != 'salary') ? ((int) $client_id) : "0"); // fk_soc can't be null
+			$sql .= ", '".$this->db->escape($client_nom)."'";
+			$sql .= ", ".((float) price2num($amount));
+			$sql .= ", '".$this->db->escape($code_banque)."'";
+			$sql .= ", '".$this->db->escape($code_guichet)."'";
+			$sql .= ", '".$this->db->escape($number)."'";
+			$sql .= ", '".$this->db->escape($number_key)."'";
+			$sql .= (($sourcetype == 'salary') ? ", ".((int) $client_id) : '');
 			$sql .= ")";
 			if ($this->db->query($sql)) {
-				$line_id = $this->db->last_insert_id(MAIN_DB_PREFIX . "prelevement_lignes");
+				$line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_lignes");
 				$result = 0;
 			} else {
-				$this->errors[] = get_class($this) . "::addline Error -2 " . $this->db->lasterror;
-				dol_syslog(get_class($this) . "::addline Error -2");
+				$this->errors[] = get_class($this)."::addline Error -2 ".$this->db->lasterror;
+				dol_syslog(get_class($this)."::addline Error -2");
 				$result = -2;
 			}
 		}
@@ -408,15 +408,15 @@ 
 		$sql .= ", p.type";
 		$sql .= ", p.fk_bank_account";
 		$sql .= ", p.statut as status";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "prelevement_bons as p";
-		$sql .= " WHERE p.entity IN (" . getEntity('invoice') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+		$sql .= " WHERE p.entity IN (".getEntity('invoice').")";
 		if ($rowid > 0) {
-			$sql .= " AND p.rowid = " . ((int) $rowid);
+			$sql .= " AND p.rowid = ".((int) $rowid);
 		} else {
-			$sql .= " AND p.ref = '" . $this->db->escape($ref) . "'";
+			$sql .= " AND p.ref = '".$this->db->escape($ref)."'";
 		}
 
-		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			if ($this->db->num_rows($result)) {
@@ -442,13 +442,13 @@ 
 				if (empty($this->status)) {		// Value is sometimes null in database
 					$this->status = 0;
 				}
-				$this->statut         = $this->status; // For backward compatibility
+				$this->statut = $this->status; // For backward compatibility
 
 				$this->fetched = 1;
 
 				return 1;
 			} else {
-				dol_syslog(get_class($this) . "::Fetch no record found");
+				dol_syslog(get_class($this)."::Fetch no record found");
 				return 0;
 			}
 		} else {
@@ -489,19 +489,19 @@ 
 			if ($date < $this->date_trans) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorDateOfMovementLowerThanDateOfFileTransmission');
-				dol_syslog("bon-prelevment::set_infocredit 1027 " . $this->error);
+				dol_syslog("bon-prelevment::set_infocredit 1027 ".$this->error);
 				return -1027;
 			}
 
 			$this->db->begin();
 
-			$sql = " UPDATE " . MAIN_DB_PREFIX . "prelevement_bons";
-			$sql .= " SET fk_user_credit = " . ((int) $user->id);
-			$sql .= ", statut = " . self::STATUS_CREDITED;
-			$sql .= ", date_credit = '" . $this->db->idate($date) . "'";
-			$sql .= " WHERE rowid = " . ((int) $this->id);
-			$sql .= " AND entity = " . ((int) $conf->entity);
-			$sql .= " AND statut = " . self::STATUS_TRANSFERED;
+			$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
+			$sql .= " SET fk_user_credit = ".((int) $user->id);
+			$sql .= ", statut = ".self::STATUS_CREDITED;
+			$sql .= ", date_credit = '".$this->db->idate($date)."'";
+			$sql .= " WHERE rowid = ".((int) $this->id);
+			$sql .= " AND entity = ".((int) $conf->entity);
+			$sql .= " AND statut = ".self::STATUS_TRANSFERED;
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -616,7 +616,7 @@ 
 						$error++;
 						$this->error = $paiement->error;
 						$this->errors = $paiement->errors;
-						dol_syslog(get_class($this) . "::set_infocredit AddPayment Error " . $this->error);
+						dol_syslog(get_class($this)."::set_infocredit AddPayment Error ".$this->error);
 					} else {
 						if ($this->type == 'bank-transfer') {
 							if ($type == 'salary') {
@@ -631,7 +631,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);
@@ -640,7 +640,7 @@ 
 							$error++;
 							$this->error = $paiement->error;
 							$this->errors = $paiement->errors;
-							dol_syslog(get_class($this) . "::set_infocredit AddPaymentToBank Error " . $this->error);
+							dol_syslog(get_class($this)."::set_infocredit AddPaymentToBank Error ".$this->error);
 						}
 					}
 				}
@@ -648,24 +648,24 @@ 
 				// Update withdrawal line
 				// TODO: Translate to ligneprelevement.class.php
 				if (!$error) {
-					$sql = " UPDATE " . MAIN_DB_PREFIX . "prelevement_lignes";
+					$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
 					$sql .= " SET statut = 2";
-					$sql .= " WHERE fk_prelevement_bons = " . ((int) $this->id);
+					$sql .= " WHERE fk_prelevement_bons = ".((int) $this->id);
 
 					if (!$this->db->query($sql)) {
-						dol_syslog(get_class($this) . "::set_infocredit Update lines Error");
+						dol_syslog(get_class($this)."::set_infocredit Update lines Error");
 						$error++;
 					}
 				}
 			} else {
 				$this->error = $this->db->lasterror();
-				dol_syslog(get_class($this) . "::set_infocredit Update Bons Error");
+				dol_syslog(get_class($this)."::set_infocredit Update Bons Error");
 				$error++;
 			}
 
 			// End of procedure
 			if ($error == 0) {
-				$this->date_credit = $date;		// date credit or debit
+				$this->date_credit = $date; // date credit or debit
 				$this->statut = self::STATUS_CREDITED;
 				$this->status = self::STATUS_CREDITED;
 
@@ -696,17 +696,17 @@ 
 
 		$error = 0;
 
-		dol_syslog(get_class($this) . "::set_infotrans Start", LOG_INFO);
+		dol_syslog(get_class($this)."::set_infotrans Start", LOG_INFO);
 
 		if ($this->db->begin()) {
-			$sql = "UPDATE " . MAIN_DB_PREFIX . "prelevement_bons ";
-			$sql .= " SET fk_user_trans = " . $user->id;
-			$sql .= " , date_trans = '" . $this->db->idate($date) . "'";
-			$sql .= " , method_trans = " . ((int) $method);
-			$sql .= " , statut = " . self::STATUS_TRANSFERED;
-			$sql .= " WHERE rowid = " . ((int) $this->id);
-			$sql .= " AND entity = " . ((int) $conf->entity);
-			$sql .= " AND statut = " . self::STATUS_DRAFT;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons ";
+			$sql .= " SET fk_user_trans = ".$user->id;
+			$sql .= " , date_trans = '".$this->db->idate($date)."'";
+			$sql .= " , method_trans = ".((int) $method);
+			$sql .= " , statut = ".self::STATUS_TRANSFERED;
+			$sql .= " WHERE rowid = ".((int) $this->id);
+			$sql .= " AND entity = ".((int) $conf->entity);
+			$sql .= " AND statut = ".self::STATUS_DRAFT;
 
 			if ($this->db->query($sql)) {
 				$this->method_trans = $method;
@@ -731,12 +731,12 @@ 
 				return 0;
 			} else {
 				$this->db->rollback();
-				dol_syslog(get_class($this) . "::set_infotrans ROLLBACK", LOG_ERR);
+				dol_syslog(get_class($this)."::set_infotrans ROLLBACK", LOG_ERR);
 
 				return -1;
 			}
 		} else {
-			dol_syslog(get_class($this) . "::set_infotrans Ouverture transaction SQL impossible", LOG_CRIT);
+			dol_syslog(get_class($this)."::set_infotrans Ouverture transaction SQL impossible", LOG_CRIT);
 			return -2;
 		}
 	}
@@ -754,7 +754,7 @@ 
 
 		$arr = array();
 
-		dol_syslog(get_class($this) . "::getListInvoices");
+		dol_syslog(get_class($this)."::getListInvoices");
 
 		// Returns all invoices presented within same order
 		$sql = "SELECT ";
@@ -770,13 +770,13 @@ 
 		if ($amounts) {
 			$sql .= ", SUM(pl.amount)";
 		}
-		$sql .= " FROM " . MAIN_DB_PREFIX . "prelevement_bons as pb,";
-		$sql .= " " . MAIN_DB_PREFIX . "prelevement_lignes as pl,";
-		$sql .= " " . MAIN_DB_PREFIX . "prelevement as p";
+		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as pb,";
+		$sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+		$sql .= " ".MAIN_DB_PREFIX."prelevement as p";
 		$sql .= " WHERE p.fk_prelevement_lignes = pl.rowid";
 		$sql .= " AND pl.fk_prelevement_bons = pb.rowid";
-		$sql .= " AND pb.rowid = " . ((int) $this->id);
-		$sql .= " AND pb.entity = " . ((int) $conf->entity);
+		$sql .= " AND pb.rowid = ".((int) $this->id);
+		$sql .= " AND pb.entity = ".((int) $conf->entity);
 		if ($amounts) {
 			if ($this->type == 'bank-transfer') {
 				if ($type == 'salary') {
@@ -830,17 +830,17 @@ 
 		$sql = "SELECT sum(pd.amount) as nb";
 		if ($type !== 'salary') {
 			if ($mode != 'bank-transfer') {
-				$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f,";
+				$sql .= " FROM ".MAIN_DB_PREFIX."facture as f,";
 			} else {
-				$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f,";
+				$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,";
 			}
 		} else {
-			$sql .= " FROM " . MAIN_DB_PREFIX . "salary as s,";
+			$sql .= " FROM ".MAIN_DB_PREFIX."salary as s,";
 		}
-		$sql .= " " . MAIN_DB_PREFIX . "prelevement_demande as pd";
-		$sql .= ($type !== 'salary' ? " WHERE f.entity IN (" . getEntity('invoice') . ")" : " WHERE s.entity IN (" . getEntity('salary') . ")");
+		$sql .= " ".MAIN_DB_PREFIX."prelevement_demande as pd";
+		$sql .= ($type !== 'salary' ? " WHERE f.entity IN (".getEntity('invoice').")" : " WHERE s.entity IN (".getEntity('salary').")");
 		if (!getDolGlobalString('WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS')) {
-			$sql .= ($type !== 'salary' ? " AND f.fk_statut = " . Facture::STATUS_VALIDATED : " AND s.paye = " . Salary::STATUS_UNPAID);
+			$sql .= ($type !== 'salary' ? " AND f.fk_statut = ".Facture::STATUS_VALIDATED : " AND s.paye = ".Salary::STATUS_UNPAID);
 		}
 		if ($type !== 'salary') {
 			if ($mode != 'bank-transfer') {
@@ -865,7 +865,7 @@ 
 			return $obj->nb;
 		} else {
 			$error = 1;
-			dol_syslog(get_class($this) . "::SommeAPrelever Erreur -1");
+			dol_syslog(get_class($this)."::SommeAPrelever Erreur -1");
 			dol_syslog($this->db->error());
 
 			return -1;
@@ -901,26 +901,26 @@ 
 		// phpcs:enable
 		if ($forsalary == 1) {
 			$sql = "SELECT count(s.rowid) as nb";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "salary as s";
+			$sql .= " FROM ".MAIN_DB_PREFIX."salary as s";
 		} else {
 			$sql = "SELECT count(f.rowid) as nb";
 
 			if ($type == 'bank-transfer') {
-				$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
+				$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 			} else {
-				$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
+				$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 			}
 		}
-		$sql .= ", " . MAIN_DB_PREFIX . "prelevement_demande as pd";
+		$sql .= ", ".MAIN_DB_PREFIX."prelevement_demande as pd";
 		if ($forsalary == 1) {
-			$sql .= " WHERE s.entity IN (" . getEntity('invoice') . ")";
+			$sql .= " WHERE s.entity IN (".getEntity('invoice').")";
 			if (!getDolGlobalString('WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS')) {
 				$sql .= " AND s.paye = 0";
 			}
 		} else {
-			$sql .= " WHERE f.entity IN (" . getEntity('invoice') . ")";
+			$sql .= " WHERE f.entity IN (".getEntity('invoice').")";
 			if (!getDolGlobalString('WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS')) {
-				$sql .= " AND f.fk_statut = " . Facture::STATUS_VALIDATED;
+				$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 			}
 		}
 		if ($forsalary == 1) {
@@ -940,7 +940,7 @@ 
 			$sql .= " AND s.paye = 0";
 		}
 
-		dol_syslog(get_class($this) . "::NbFactureAPrelever");
+		dol_syslog(get_class($this)."::NbFactureAPrelever");
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
@@ -949,7 +949,7 @@ 
 
 			return $obj->nb;
 		} else {
-			$this->error = get_class($this) . "::NbFactureAPrelever Erreur -1 sql=" . $this->db->error();
+			$this->error = get_class($this)."::NbFactureAPrelever Erreur -1 sql=".$this->db->error();
 			return -1;
 		}
 	}
@@ -981,10 +981,10 @@ 
 		// phpcs:enable
 		global $conf, $langs, $user;
 
-		dol_syslog(__METHOD__ . " Bank=" . $banque . " Office=" . $agence . " mode=" . $mode . " format=" . $format, LOG_DEBUG);
+		dol_syslog(__METHOD__." Bank=".$banque." Office=".$agence." mode=".$mode." format=".$format, LOG_DEBUG);
 
-		require_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php";
-		require_once DOL_DOCUMENT_ROOT . "/societe/class/societe.class.php";
+		require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
+		require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 
 		// Check params
 		if ($type != 'bank-transfer') {
@@ -1020,7 +1020,7 @@ 
 		$factures_prev_id = array();
 		$factures_errors = array();
 		if (!$error) {
-			dol_syslog(__METHOD__ . " Read invoices for did=" . ((int) $did), LOG_DEBUG);
+			dol_syslog(__METHOD__." Read invoices for did=".((int) $did), LOG_DEBUG);
 
 			$sql = "SELECT f.rowid, pd.rowid as pfdrowid";
 			if ($sourcetype != 'salary') {
@@ -1039,28 +1039,28 @@ 
 			}
 			if ($sourcetype != 'salary') {
 				if ($type != 'bank-transfer') {
-					$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
-					$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "prelevement_demande as pd ON f.rowid = pd.fk_facture";
+					$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+					$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."prelevement_demande as pd ON f.rowid = pd.fk_facture";
 				} else {
-					$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
-					$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "prelevement_demande as pd ON f.rowid = pd.fk_facture_fourn";
+					$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+					$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."prelevement_demande as pd ON f.rowid = pd.fk_facture_fourn";
 				}
-				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
-				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_rib as sr ON s.rowid = sr.fk_soc AND sr.default_rib = 1";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_rib as sr ON s.rowid = sr.fk_soc AND sr.default_rib = 1";
 			} else {
-				$sql .= " FROM " . MAIN_DB_PREFIX . "salary as f";
-				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "prelevement_demande as pd ON f.rowid = pd.fk_salary";
-				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as s ON s.rowid = f.fk_user";
-				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user_rib as sr ON s.rowid = sr.fk_user";	// TODO Add AND sr.default_rib = 1 here
+				$sql .= " FROM ".MAIN_DB_PREFIX."salary as f";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."prelevement_demande as pd ON f.rowid = pd.fk_salary";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as s ON s.rowid = f.fk_user";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user_rib as sr ON s.rowid = sr.fk_user"; // TODO Add AND sr.default_rib = 1 here
 			}
 			if ($sourcetype != 'salary') {
 				if ($type != 'bank-transfer') {
-					$sql .= " WHERE f.entity IN (" . getEntity('invoice') . ')';
+					$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
 				} else {
-					$sql .= " WHERE f.entity IN (" . getEntity('supplier_invoice') . ')';
+					$sql .= " WHERE f.entity IN (".getEntity('supplier_invoice').')';
 				}
 			} else {
-				$sql .= " WHERE f.entity IN (" . getEntity('salary') . ')';
+				$sql .= " WHERE f.entity IN (".getEntity('salary').')';
 			}
 			if ($sourcetype != 'salary') {
 				$sql .= " AND f.fk_statut = 1"; // Invoice validated
@@ -1074,10 +1074,10 @@ 
 			$sql .= " AND pd.traite = 0";
 			$sql .= " AND pd.ext_payment_id IS NULL";
 			if ($sourcetype != 'salary') {
-				$sql .= " AND sr.type = 'ban'";		// TODO Add AND sr.type = 'ban' for users too
+				$sql .= " AND sr.type = 'ban'"; // TODO Add AND sr.type = 'ban' for users too
 			}
 			if ($did > 0) {
-				$sql .= " AND pd.rowid = " . ((int) $did);
+				$sql .= " AND pd.rowid = ".((int) $did);
 			}
 
 			$resql = $this->db->query($sql);
@@ -1086,41 +1086,41 @@ 
 				$i = 0;
 
 				while ($i < $num) {
-					$row = $this->db->fetch_row($resql);	// TODO Replace with fetch_object()
+					$row = $this->db->fetch_row($resql); // TODO Replace with fetch_object()
 					$factures[$i] = $row; // All fields
 
 					if ($row[7] == 0) {
 						$error++;
-						dol_syslog(__METHOD__ . " Read invoices/salary error Found a null amount", LOG_ERR);
-						$this->invoice_in_error[$row[0]] = "Error for invoice or salary id " . $row[0] . ", found a null amount";
+						dol_syslog(__METHOD__." Read invoices/salary error Found a null amount", LOG_ERR);
+						$this->invoice_in_error[$row[0]] = "Error for invoice or salary id ".$row[0].", found a null amount";
 						break;
 					}
 					$i++;
 				}
 
 				$this->db->free($resql);
-				dol_syslog(__METHOD__ . " Read invoices/salary, " . $i . " invoices/salary to withdraw", LOG_DEBUG);
+				dol_syslog(__METHOD__." Read invoices/salary, ".$i." invoices/salary to withdraw", LOG_DEBUG);
 			} else {
 				$error++;
 				$this->error = $this->db->lasterror();
-				dol_syslog(__METHOD__ . " Read invoices/salary error " . $this->db->lasterror(), LOG_ERR);
+				dol_syslog(__METHOD__." Read invoices/salary error ".$this->db->lasterror(), LOG_ERR);
 				return -1;
 			}
 		}
 
 		if (!$error) {
 			// Make some checks
-			require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 
 			$tmpsoc = new Societe($this->db);
 			$tmpuser = new User($this->db);
 
 			// Check BAN
 			$i = 0;
-			dol_syslog(__METHOD__ . " Check BAN", LOG_DEBUG);
+			dol_syslog(__METHOD__." Check BAN", LOG_DEBUG);
 
 			if (count($factures) > 0) {
 				foreach ($factures as $key => $fac) {
@@ -1160,31 +1160,31 @@ 
 							if ($type != 'bank-transfer') {
 								$tmpsoc->id = $fac[2];
 								$tmpsoc->name = $fac[8];
-								$invoice_url = "<a href='" . DOL_URL_ROOT . '/compta/facture/card.php?facid=' . $fac[0] . "'>" . $fac[9] . "</a>";
-								$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice " . $invoice_url . " for thirdparty " . $tmpsoc->getNomUrl(0);
-								$this->thirdparty_in_error[$tmpsoc->id] = "Error on default bank number IBAN/BIC for invoice " . $invoice_url . " for thirdparty " . $tmpsoc->getNomUrl(0);
+								$invoice_url = "<a href='".DOL_URL_ROOT.'/compta/facture/card.php?facid='.$fac[0]."'>".$fac[9]."</a>";
+								$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice ".$invoice_url." for thirdparty ".$tmpsoc->getNomUrl(0);
+								$this->thirdparty_in_error[$tmpsoc->id] = "Error on default bank number IBAN/BIC for invoice ".$invoice_url." for thirdparty ".$tmpsoc->getNomUrl(0);
 								$error++;
 							}
 							if ($type == 'bank-transfer' && $sourcetype != 'salary') {
 								$tmpsoc->id = $fac[2];
 								$tmpsoc->name = $fac[8];
-								$invoice_url = "<a href='" . DOL_URL_ROOT . '/fourn/facture/card.php?facid=' . $fac[0] . "'>" . $fac[9] . "</a>";
-								$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice " . $invoice_url . " for thirdparty " . $tmpsoc->getNomUrl(0);
-								$this->thirdparty_in_error[$tmpsoc->id] = "Error on default bank number IBAN/BIC for invoice " . $invoice_url . " for thirdparty " . $tmpsoc->getNomUrl(0);
+								$invoice_url = "<a href='".DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$fac[0]."'>".$fac[9]."</a>";
+								$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice ".$invoice_url." for thirdparty ".$tmpsoc->getNomUrl(0);
+								$this->thirdparty_in_error[$tmpsoc->id] = "Error on default bank number IBAN/BIC for invoice ".$invoice_url." for thirdparty ".$tmpsoc->getNomUrl(0);
 								$error++;
 							}
 							if ($type == 'bank-transfer' && $sourcetype == 'salary') {
 								$tmpuser->id = $fac[2];
 								$tmpuser->firstname = $fac[8];
-								$salary_url = "<a href='" . DOL_URL_ROOT . '/salaries/card.php?id=' . $fac[0] . "'>" . $fac[0] . "</a>";
-								$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for salary " . $salary_url . " for employee " . $tmpuser->getNomUrl(0);
-								$this->thirdparty_in_error[$tmpuser->id] = "Error on default bank number IBAN/BIC for salary " . $salary_url . " for employee " . $tmpuser->getNomUrl(0);
+								$salary_url = "<a href='".DOL_URL_ROOT.'/salaries/card.php?id='.$fac[0]."'>".$fac[0]."</a>";
+								$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for salary ".$salary_url." for employee ".$tmpuser->getNomUrl(0);
+								$this->thirdparty_in_error[$tmpuser->id] = "Error on default bank number IBAN/BIC for salary ".$salary_url." for employee ".$tmpuser->getNomUrl(0);
 								$error++;
 							}
-							dol_syslog(__METHOD__ . " Check BAN Error on default bank number IBAN/BIC reported by verif(): " . implode(', ', $fac), LOG_WARNING);
+							dol_syslog(__METHOD__." Check BAN Error on default bank number IBAN/BIC reported by verif(): ".implode(', ', $fac), LOG_WARNING);
 						}
 					} else {
-						dol_syslog(__METHOD__ . " Check BAN Failed to read company", LOG_WARNING);
+						dol_syslog(__METHOD__." Check BAN Failed to read company", LOG_WARNING);
 					}
 					/*
 					} else {
@@ -1193,14 +1193,14 @@ 
 					*/
 				}
 			} else {
-				dol_syslog(__METHOD__ . " Check BAN No invoice to process", LOG_WARNING);
+				dol_syslog(__METHOD__." Check BAN No invoice to process", LOG_WARNING);
 			}
 		}
 
 		$ok = 0;
 
 		// Withdraw invoices in factures_prev array
-		$out = count($factures_prev) . " invoices will be included.";
+		$out = count($factures_prev)." invoices will be included.";
 		//print $out."\n";
 		dol_syslog($out);
 
@@ -1234,32 +1234,32 @@ 
 			 * Process order generation
 			 */
 			if (!$error) {
-				$ref = substr($year, -2) . $month;
+				$ref = substr($year, -2).$month;
 
 				// Get next free number for the ref of bon prelevement
-				$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);
+				$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);
 				$sql .= " ORDER BY ref DESC LIMIT 1";
 
-				dol_syslog(get_class($this) . " get next free number", LOG_DEBUG);
+				dol_syslog(get_class($this)." get next free number", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 
 				if ($resql) {
 					$row = $this->db->fetch_row($resql);
 
 					// Build the new ref
-					$ref = "T" . $ref . sprintf("%02d", (intval($row[0]) + 1));
+					$ref = "T".$ref.sprintf("%02d", (intval($row[0]) + 1));
 
 					// $conf->abc->dir_output may be:
 					// /home/ldestailleur/git/dolibarr_15.0/documents/abc/
 					// or
 					// /home/ldestailleur/git/dolibarr_15.0/documents/X/abc with X >= 2 with multicompany.
 					if ($type != 'bank-transfer') {
-						$dir = $conf->prelevement->dir_output . '/receipts';
+						$dir = $conf->prelevement->dir_output.'/receipts';
 					} else {
-						$dir = $conf->paymentbybanktransfer->dir_output . '/receipts';
+						$dir = $conf->paymentbybanktransfer->dir_output.'/receipts';
 					}
 					if (!is_dir($dir)) {
 						dol_mkdir($dir);
@@ -1267,41 +1267,41 @@ 
 
 					if (isModEnabled('multicompany')) {
 						$labelentity = $conf->entity;
-						$this->filename = $dir . '/' . $ref . '-' . $labelentity . '.xml';
+						$this->filename = $dir.'/'.$ref.'-'.$labelentity.'.xml';
 					} else {
-						$this->filename = $dir . '/' . $ref . '.xml';
+						$this->filename = $dir.'/'.$ref.'.xml';
 					}
 
 					// Create withdraw order in database
-					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "prelevement_bons (";
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (";
 					$sql .= "ref, entity, datec, type, fk_bank_account";
 					$sql .= ") VALUES (";
-					$sql .= "'" . $this->db->escape($ref) . "'";
-					$sql .= ", " . ((int) $conf->entity);
-					$sql .= ", '" . $this->db->idate($now) . "'";
-					$sql .= ", '" . ($type == 'bank-transfer' ? 'bank-transfer' : 'debit-order') . "'";
-					$sql .= ", " . ((int) $fk_bank_account);
+					$sql .= "'".$this->db->escape($ref)."'";
+					$sql .= ", ".((int) $conf->entity);
+					$sql .= ", '".$this->db->idate($now)."'";
+					$sql .= ", '".($type == 'bank-transfer' ? 'bank-transfer' : 'debit-order')."'";
+					$sql .= ", ".((int) $fk_bank_account);
 					$sql .= ")";
 
 					$resql = $this->db->query($sql);
 
 
 					if ($resql) {
-						$prev_id = $this->db->last_insert_id(MAIN_DB_PREFIX . "prelevement_bons");
+						$prev_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_bons");
 						$this->id = $prev_id;
 						$this->ref = $ref;
 					} else {
 						$error++;
-						dol_syslog(__METHOD__ . " Create withdraw receipt " . $this->db->lasterror(), LOG_ERR);
+						dol_syslog(__METHOD__." Create withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 					}
 				} else {
 					$error++;
-					dol_syslog(__METHOD__ . " Get last withdraw receipt " . $this->db->lasterror(), LOG_ERR);
+					dol_syslog(__METHOD__." Get last withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 				}
 			}
 
 			if (!$error) {
-				dol_syslog(__METHOD__ . " Now loop on each document to insert them in llx_prelevement_demande");
+				dol_syslog(__METHOD__." Now loop on each document to insert them in llx_prelevement_demande");
 
 				// Add lines for the bon
 				if (count($factures_prev) > 0) {
@@ -1330,17 +1330,17 @@ 
 						}
 
 						// Update invoice requests as done
-						$sql = "UPDATE " . MAIN_DB_PREFIX . "prelevement_demande";
+						$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande";
 						$sql .= " SET traite = 1";
-						$sql .= ", date_traite = '" . $this->db->idate($now) . "'";
-						$sql .= ", fk_prelevement_bons = " . ((int) $this->id);
-						$sql .= " WHERE rowid = " . ((int) $fac[1]);
+						$sql .= ", date_traite = '".$this->db->idate($now)."'";
+						$sql .= ", fk_prelevement_bons = ".((int) $this->id);
+						$sql .= " WHERE rowid = ".((int) $fac[1]);
 
 						$resql = $this->db->query($sql);
 						if (!$resql) {
 							$error++;
 							$this->errors[] = $this->db->lasterror();
-							dol_syslog(__METHOD__ . " Update Error=" . $this->db->lasterror(), LOG_ERR);
+							dol_syslog(__METHOD__." Update Error=".$this->db->lasterror(), LOG_ERR);
 						}
 					}
 				}
@@ -1351,7 +1351,7 @@ 
 				 * Create file of type='direct-debit' for direct debit order or type='bank-transfer' for credit transfer into a XML file
 				 */
 
-				dol_syslog(__METHOD__ . " Init direct debit or credit transfer file for " . count($factures_prev) . " invoices", LOG_DEBUG);
+				dol_syslog(__METHOD__." Init direct debit or credit transfer file for ".count($factures_prev)." invoices", LOG_DEBUG);
 
 				if (count($factures_prev) > 0) {
 					$this->date_echeance = $datetimeprev;
@@ -1367,7 +1367,7 @@ 
 						$this->emetteur_iban               = $account->iban;
 						$this->emetteur_bic                = $account->bic;
 
-						$this->emetteur_ics = (($type == 'bank-transfer' && getDolGlobalString("SEPA_USE_IDS")) ? $account->ics_transfer : $account->ics);	// Example "FR78ZZZ123456"
+						$this->emetteur_ics = (($type == 'bank-transfer' && getDolGlobalString("SEPA_USE_IDS")) ? $account->ics_transfer : $account->ics); // Example "FR78ZZZ123456"
 
 						$this->raison_sociale = $account->proprio;
 					}
@@ -1386,7 +1386,7 @@ 
 						$error++;
 					}
 				}
-				dol_syslog(__METHOD__ . " Bank order file has been generated under filename " . $this->filename, LOG_DEBUG);
+				dol_syslog(__METHOD__." Bank order file has been generated under filename ".$this->filename, LOG_DEBUG);
 			}
 
 
@@ -1394,15 +1394,15 @@ 
 			 * Update total defined after generation of file
 			 */
 			if (!$error) {
-				$sql = "UPDATE " . MAIN_DB_PREFIX . "prelevement_bons";
-				$sql .= " SET amount = " . price2num($this->total);
-				$sql .= " WHERE rowid = " . ((int) $this->id);
-				$sql .= " AND entity = " . ((int) $conf->entity);
+				$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
+				$sql .= " SET amount = ".price2num($this->total);
+				$sql .= " WHERE rowid = ".((int) $this->id);
+				$sql .= " AND entity = ".((int) $conf->entity);
 				$resql = $this->db->query($sql);
 
 				if (!$resql) {
 					$error++;
-					dol_syslog(__METHOD__ . " Error update total: " . $this->db->error(), LOG_ERR);
+					dol_syslog(__METHOD__." Error update total: ".$this->db->error(), LOG_ERR);
 				}
 			}
 
@@ -1422,7 +1422,7 @@ 
 
 			if (!$error) {
 				$this->db->commit();
-				return count($factures_prev);	// The error of failed lines are into $this->invoice_in_error and $this->thirdparty_in_error
+				return count($factures_prev); // The error of failed lines are into $this->invoice_in_error and $this->thirdparty_in_error
 			} else {
 				$this->db->rollback();
 				return -1;
@@ -1461,7 +1461,7 @@ 
 		}
 
 		if (!$error) {
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "prelevement WHERE fk_prelevement_lignes IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "prelevement_lignes WHERE fk_prelevement_bons = " . ((int) $this->id) . ")";
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".((int) $this->id).")";
 			$resql1 = $this->db->query($sql);
 			if (!$resql1) {
 				dol_print_error($this->db);
@@ -1469,7 +1469,7 @@ 
 		}
 
 		if (!$error) {
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "prelevement_lignes WHERE fk_prelevement_bons = " . ((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".((int) $this->id);
 			$resql2 = $this->db->query($sql);
 			if (!$resql2) {
 				dol_print_error($this->db);
@@ -1477,7 +1477,7 @@ 
 		}
 
 		if (!$error) {
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "prelevement_bons WHERE rowid = " . ((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = ".((int) $this->id);
 			$resql3 = $this->db->query($sql);
 			if (!$resql3) {
 				dol_print_error($this->db);
@@ -1485,7 +1485,7 @@ 
 		}
 
 		if (!$error) {
-			$sql = "UPDATE " . MAIN_DB_PREFIX . "prelevement_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = " . ((int) $this->id);
+			$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = ".((int) $this->id);
 			$resql4 = $this->db->query($sql);
 			if (!$resql4) {
 				dol_print_error($this->db);
@@ -1527,22 +1527,22 @@ 
 			$labeltoshow = 'PaymentByBankTransfer';
 		}
 
-		$label = img_picto('', $this->picto) . ' <u>' . $langs->trans($labeltoshow) . '</u> ' . $this->getLibStatut(5);
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans($labeltoshow).'</u> '.$this->getLibStatut(5);
 		$label .= '<br>';
-		$label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (isset($this->amount)) {
-			$label .= '<br><b>' . $langs->trans("Amount") . ":</b> " . price($this->amount);
+			$label .= '<br><b>'.$langs->trans("Amount").":</b> ".price($this->amount);
 		}
 		if (isset($this->date_trans)) {
-			$label .= '<br><b>' . $langs->trans("TransData") . ":</b> " . dol_print_date($this->date_trans, 'dayhour', 'tzuserrel');
+			$label .= '<br><b>'.$langs->trans("TransData").":</b> ".dol_print_date($this->date_trans, 'dayhour', 'tzuserrel');
 		}
 		/*if (isset($this->date_credit)) {
 			$label .= '<br><b>'.$langs->trans("TransData").":</b> ".dol_print_date($this->date_credit, 'dayhour', 'tzuserrel');
 		}*/
 
-		$url = DOL_URL_ROOT . '/compta/prelevement/card.php?id=' . $this->id;
+		$url = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id;
 		if (!empty($this->type) && $this->type == 'bank-transfer') {
-			$url = DOL_URL_ROOT . '/compta/prelevement/card.php?id=' . $this->id;
+			$url = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id;
 		}
 
 		if ($option != 'nolink') {
@@ -1560,21 +1560,21 @@ 
 		if (empty($notooltip)) {
 			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
-				$linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ' title="' . dol_escape_htmltag($label, 1) . '"';
-			$linkclose .= ' class="classfortooltip' . ($morecss ? ' ' . $morecss : '') . '"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 		} else {
-			$linkclose = ($morecss ? ' class="' . $morecss . '"' : '');
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
 
-		$linkstart = '<a href="' . $url . '"';
-		$linkstart .= $linkclose . '>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
 		if ($withpicto) {
-			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
 		}
 		if ($withpicto != 2) {
 			$result .= $this->ref;
@@ -1603,8 +1603,8 @@ 
 	 */
 	public function deleteNotificationById($rowid)
 	{
-		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "notify_def";
-		$sql .= " WHERE rowid = " . ((int) $rowid);
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
+		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		if ($this->db->query($sql)) {
 			return 0;
@@ -1628,8 +1628,8 @@ 
 			$userid = $user;
 		}
 
-		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "notify_def";
-		$sql .= " WHERE fk_user=" . ((int) $userid) . " AND fk_action='" . $this->db->escape($action) . "'";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
+		$sql .= " WHERE fk_user=".((int) $userid)." AND fk_action='".$this->db->escape($action)."'";
 
 		if ($this->db->query($sql)) {
 			return 0;
@@ -1661,15 +1661,15 @@ 
 		if ($this->deleteNotification($user, $action) == 0) {
 			$now = dol_now();
 
-			$sql = "INSERT INTO " . MAIN_DB_PREFIX . "notify_def (datec,fk_user, fk_soc, fk_contact, fk_action)";
-			$sql .= " VALUES ('" . $this->db->idate($now) . "', " . ((int) $userid) . ", 'NULL', 'NULL', '" . $this->db->escape($action) . "')";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_soc, fk_contact, fk_action)";
+			$sql .= " VALUES ('".$this->db->idate($now)."', ".((int) $userid).", 'NULL', 'NULL', '".$this->db->escape($action)."')";
 
-			dol_syslog("adnotiff: " . $sql);
+			dol_syslog("adnotiff: ".$sql);
 			if ($this->db->query($sql)) {
 				$result = 0;
 			} else {
 				$result = -1;
-				dol_syslog(get_class($this) . "::addNotification Error $result");
+				dol_syslog(get_class($this)."::addNotification Error $result");
 			}
 		}
 
@@ -1704,7 +1704,7 @@ 
 
 		$result = 0;
 
-		dol_syslog(get_class($this) . "::generate build file=" . $this->filename . " type=" . $type);
+		dol_syslog(get_class($this)."::generate build file=".$this->filename." type=".$type);
 
 		$this->file = fopen($this->filename, "w");
 		if ($this->file == false) {
@@ -1750,13 +1750,13 @@ 
 				$sql .= " f.ref as reffac, p.fk_facture as idfac,";
 				$sql .= " rib.rowid, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, rib.rum, rib.date_rum";
 				$sql .= " FROM";
-				$sql .= " " . MAIN_DB_PREFIX . "prelevement_lignes as pl,";
-				$sql .= " " . MAIN_DB_PREFIX . "facture as f,";
-				$sql .= " " . MAIN_DB_PREFIX . "prelevement as p,";
-				$sql .= " " . MAIN_DB_PREFIX . "societe as soc,";
-				$sql .= " " . MAIN_DB_PREFIX . "c_country as c,";
-				$sql .= " " . MAIN_DB_PREFIX . "societe_rib as rib";
-				$sql .= " WHERE pl.fk_prelevement_bons = " . ((int) $this->id);
+				$sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+				$sql .= " ".MAIN_DB_PREFIX."facture as f,";
+				$sql .= " ".MAIN_DB_PREFIX."prelevement as p,";
+				$sql .= " ".MAIN_DB_PREFIX."societe as soc,";
+				$sql .= " ".MAIN_DB_PREFIX."c_country as c,";
+				$sql .= " ".MAIN_DB_PREFIX."societe_rib as rib";
+				$sql .= " WHERE pl.fk_prelevement_bons = ".((int) $this->id);
 				$sql .= " AND pl.rowid = p.fk_prelevement_lignes";
 				$sql .= " AND p.fk_facture = f.rowid";
 				$sql .= " AND f.fk_soc = soc.rowid";
@@ -1792,7 +1792,7 @@ 
 					$nbtotalDrctDbtTxInf = $i;
 				} else {
 					$this->error = $this->db->lasterror();
-					fwrite($this->file, 'ERROR DEBITOR ' . $sql . $CrLf); // DEBITOR = Customers
+					fwrite($this->file, 'ERROR DEBITOR '.$sql.$CrLf); // DEBITOR = Customers
 					$result = -2;
 				}
 
@@ -1809,26 +1809,26 @@ 
 				 * SECTION CREATION SEPA FILE - ISO200022
 				 */
 				// SEPA File Header
-				fwrite($this->file, '<' . '?xml version="1.0" encoding="UTF-8" standalone="yes"?' . '>' . $CrLf);
-				fwrite($this->file, '<Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' . $CrLf);
-				fwrite($this->file, '	<CstmrDrctDbtInitn>' . $CrLf);
+				fwrite($this->file, '<'.'?xml version="1.0" encoding="UTF-8" standalone="yes"?'.'>'.$CrLf);
+				fwrite($this->file, '<Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'.$CrLf);
+				fwrite($this->file, '	<CstmrDrctDbtInitn>'.$CrLf);
 				// SEPA Group header
-				fwrite($this->file, '		<GrpHdr>' . $CrLf);
-				fwrite($this->file, '			<MsgId>' . ('DD/' . $dateTime_YMD . '/REF' . $this->id) . '</MsgId>' . $CrLf);
-				fwrite($this->file, '			<CreDtTm>' . $dateTime_ECMA . '</CreDtTm>' . $CrLf);
-				fwrite($this->file, '			<NbOfTxs>' . $i . '</NbOfTxs>' . $CrLf);
-				fwrite($this->file, '			<CtrlSum>' . $this->total . '</CtrlSum>' . $CrLf);
-				fwrite($this->file, '			<InitgPty>' . $CrLf);
-				fwrite($this->file, '				<Nm>' . dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))) . '</Nm>' . $CrLf);
-				fwrite($this->file, '				<Id>' . $CrLf);
-				fwrite($this->file, '				    <PrvtId>' . $CrLf);
-				fwrite($this->file, '					<Othr>' . $CrLf);
-				fwrite($this->file, '						<Id>' . $this->emetteur_ics . '</Id>' . $CrLf);
-				fwrite($this->file, '					</Othr>' . $CrLf);
-				fwrite($this->file, '				    </PrvtId>' . $CrLf);
-				fwrite($this->file, '				</Id>' . $CrLf);
-				fwrite($this->file, '			</InitgPty>' . $CrLf);
-				fwrite($this->file, '		</GrpHdr>' . $CrLf);
+				fwrite($this->file, '		<GrpHdr>'.$CrLf);
+				fwrite($this->file, '			<MsgId>'.('DD/'.$dateTime_YMD.'/REF'.$this->id).'</MsgId>'.$CrLf);
+				fwrite($this->file, '			<CreDtTm>'.$dateTime_ECMA.'</CreDtTm>'.$CrLf);
+				fwrite($this->file, '			<NbOfTxs>'.$i.'</NbOfTxs>'.$CrLf);
+				fwrite($this->file, '			<CtrlSum>'.$this->total.'</CtrlSum>'.$CrLf);
+				fwrite($this->file, '			<InitgPty>'.$CrLf);
+				fwrite($this->file, '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf);
+				fwrite($this->file, '				<Id>'.$CrLf);
+				fwrite($this->file, '				    <PrvtId>'.$CrLf);
+				fwrite($this->file, '					<Othr>'.$CrLf);
+				fwrite($this->file, '						<Id>'.$this->emetteur_ics.'</Id>'.$CrLf);
+				fwrite($this->file, '					</Othr>'.$CrLf);
+				fwrite($this->file, '				    </PrvtId>'.$CrLf);
+				fwrite($this->file, '				</Id>'.$CrLf);
+				fwrite($this->file, '			</InitgPty>'.$CrLf);
+				fwrite($this->file, '		</GrpHdr>'.$CrLf);
 				// SEPA File Emetteur
 				if ($result != -2) {
 					fwrite($this->file, $fileEmetteurSection);
@@ -1838,9 +1838,9 @@ 
 					fwrite($this->file, $fileDebiteurSection);
 				}
 				// SEPA FILE FOOTER
-				fwrite($this->file, '		</PmtInf>' . $CrLf);
-				fwrite($this->file, '	</CstmrDrctDbtInitn>' . $CrLf);
-				fwrite($this->file, '</Document>' . $CrLf);
+				fwrite($this->file, '		</PmtInf>'.$CrLf);
+				fwrite($this->file, '	</CstmrDrctDbtInitn>'.$CrLf);
+				fwrite($this->file, '</Document>'.$CrLf);
 			} else {
 				/**
 				 * SECTION CREATION FICHIER SEPA - CREDIT TRANSFER
@@ -1872,13 +1872,13 @@ 
 					$sql .= " s.ref as reffac, p.fk_salary as idfac,";
 					$sql .= " rib.rowid, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, '' as rum, '' as date_rum";
 					$sql .= " FROM";
-					$sql .= " " . MAIN_DB_PREFIX . "prelevement_lignes as pl,";
-					$sql .= " " . MAIN_DB_PREFIX . "salary as s,";
-					$sql .= " " . MAIN_DB_PREFIX . "prelevement as p,";
-					$sql .= " " . MAIN_DB_PREFIX . "user as u";
-					$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as c ON u.fk_country = c.rowid,";
-					$sql .= " " . MAIN_DB_PREFIX . "user_rib as rib";
-					$sql .= " WHERE pl.fk_prelevement_bons=" . ((int) $this->id);
+					$sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+					$sql .= " ".MAIN_DB_PREFIX."salary as s,";
+					$sql .= " ".MAIN_DB_PREFIX."prelevement as p,";
+					$sql .= " ".MAIN_DB_PREFIX."user as u";
+					$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON u.fk_country = c.rowid,";
+					$sql .= " ".MAIN_DB_PREFIX."user_rib as rib";
+					$sql .= " WHERE pl.fk_prelevement_bons=".((int) $this->id);
 					$sql .= " AND pl.rowid = p.fk_prelevement_lignes";
 					$sql .= " AND p.fk_salary = s.rowid";
 					$sql .= " AND s.fk_user = u.rowid";
@@ -1889,13 +1889,13 @@ 
 					$sql .= " f.ref as reffac, f.ref_supplier as fac_ref_supplier, p.fk_facture_fourn as idfac,";
 					$sql .= " rib.rowid, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, rib.rum, rib.date_rum";
 					$sql .= " FROM";
-					$sql .= " " . MAIN_DB_PREFIX . "prelevement_lignes as pl,";
-					$sql .= " " . MAIN_DB_PREFIX . "facture_fourn as f,";
-					$sql .= " " . MAIN_DB_PREFIX . "prelevement as p,";
-					$sql .= " " . MAIN_DB_PREFIX . "societe as soc";
-					$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as c ON soc.fk_pays = c.rowid,";
-					$sql .= " " . MAIN_DB_PREFIX . "societe_rib as rib";
-					$sql .= " WHERE pl.fk_prelevement_bons = " . ((int) $this->id);
+					$sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+					$sql .= " ".MAIN_DB_PREFIX."facture_fourn as f,";
+					$sql .= " ".MAIN_DB_PREFIX."prelevement as p,";
+					$sql .= " ".MAIN_DB_PREFIX."societe as soc";
+					$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON soc.fk_pays = c.rowid,";
+					$sql .= " ".MAIN_DB_PREFIX."societe_rib as rib";
+					$sql .= " WHERE pl.fk_prelevement_bons = ".((int) $this->id);
 					$sql .= " AND pl.rowid = p.fk_prelevement_lignes";
 					$sql .= " AND p.fk_facture_fourn = f.rowid";
 					$sql .= " AND f.fk_soc = soc.rowid";
@@ -1922,7 +1922,7 @@ 
 						$daterum = (!empty($obj->date_rum)) ? $this->db->jdate($obj->date_rum) : $this->db->jdate($obj->datec);
 						$refobj = $obj->reffac;
 						if (empty($refobj) && !empty($forsalary)) {	// If ref of salary not defined, we force a value
-							$refobj = "SAL" . $obj->idfac;
+							$refobj = "SAL".$obj->idfac;
 						}
 
 						$fileCrediteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $refobj, $obj->idfac, $obj->iban, $obj->bic, $daterum, $obj->drum, $obj->rum, $type, $obj->fac_ref_supplier);
@@ -1933,7 +1933,7 @@ 
 					$nbtotalDrctDbtTxInf = $i;
 				} else {
 					$this->error = $this->db->lasterror();
-					fwrite($this->file, 'ERROR CREDITOR ' . $sql . $CrLf); // CREDITORS = Suppliers
+					fwrite($this->file, 'ERROR CREDITOR '.$sql.$CrLf); // CREDITORS = Suppliers
 					$result = -2;
 				}
 				// Define $fileEmetteurSection. Start of block PmtInf. Will contains all $nbtotalDrctDbtTxInf
@@ -1949,26 +1949,26 @@ 
 				 * SECTION CREATION SEPA FILE - CREDIT TRANSFER - ISO200022
 				 */
 				// SEPA File Header
-				fwrite($this->file, '<' . '?xml version="1.0" encoding="UTF-8" standalone="yes"?' . '>' . $CrLf);
-				fwrite($this->file, '<Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.03" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' . $CrLf);
-				fwrite($this->file, '	<CstmrCdtTrfInitn>' . $CrLf);
+				fwrite($this->file, '<'.'?xml version="1.0" encoding="UTF-8" standalone="yes"?'.'>'.$CrLf);
+				fwrite($this->file, '<Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.03" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'.$CrLf);
+				fwrite($this->file, '	<CstmrCdtTrfInitn>'.$CrLf);
 				// SEPA Group header
-				fwrite($this->file, '		<GrpHdr>' . $CrLf);
-				fwrite($this->file, '			<MsgId>' . ('TRF/' . $dateTime_YMD . '/REF' . $this->id) . '</MsgId>' . $CrLf);
-				fwrite($this->file, '			<CreDtTm>' . $dateTime_ECMA . '</CreDtTm>' . $CrLf);
-				fwrite($this->file, '			<NbOfTxs>' . $i . '</NbOfTxs>' . $CrLf);
-				fwrite($this->file, '			<CtrlSum>' . $this->total . '</CtrlSum>' . $CrLf);
-				fwrite($this->file, '			<InitgPty>' . $CrLf);
-				fwrite($this->file, '				<Nm>' . dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))) . '</Nm>' . $CrLf);
-				fwrite($this->file, '				<Id>' . $CrLf);
-				fwrite($this->file, '				    <PrvtId>' . $CrLf);
-				fwrite($this->file, '					<Othr>' . $CrLf);
-				fwrite($this->file, '						<Id>' . $this->emetteur_ics . '</Id>' . $CrLf);
-				fwrite($this->file, '					</Othr>' . $CrLf);
-				fwrite($this->file, '				    </PrvtId>' . $CrLf);
-				fwrite($this->file, '				</Id>' . $CrLf);
-				fwrite($this->file, '			</InitgPty>' . $CrLf);
-				fwrite($this->file, '		</GrpHdr>' . $CrLf);
+				fwrite($this->file, '		<GrpHdr>'.$CrLf);
+				fwrite($this->file, '			<MsgId>'.('TRF/'.$dateTime_YMD.'/REF'.$this->id).'</MsgId>'.$CrLf);
+				fwrite($this->file, '			<CreDtTm>'.$dateTime_ECMA.'</CreDtTm>'.$CrLf);
+				fwrite($this->file, '			<NbOfTxs>'.$i.'</NbOfTxs>'.$CrLf);
+				fwrite($this->file, '			<CtrlSum>'.$this->total.'</CtrlSum>'.$CrLf);
+				fwrite($this->file, '			<InitgPty>'.$CrLf);
+				fwrite($this->file, '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf);
+				fwrite($this->file, '				<Id>'.$CrLf);
+				fwrite($this->file, '				    <PrvtId>'.$CrLf);
+				fwrite($this->file, '					<Othr>'.$CrLf);
+				fwrite($this->file, '						<Id>'.$this->emetteur_ics.'</Id>'.$CrLf);
+				fwrite($this->file, '					</Othr>'.$CrLf);
+				fwrite($this->file, '				    </PrvtId>'.$CrLf);
+				fwrite($this->file, '				</Id>'.$CrLf);
+				fwrite($this->file, '			</InitgPty>'.$CrLf);
+				fwrite($this->file, '		</GrpHdr>'.$CrLf);
 				// SEPA File Emetteur (mycompany)
 				if ($result != -2) {
 					fwrite($this->file, $fileEmetteurSection);
@@ -1978,9 +1978,9 @@ 
 					fwrite($this->file, $fileCrediteurSection);
 				}
 				// SEPA FILE FOOTER
-				fwrite($this->file, '		</PmtInf>' . $CrLf);
-				fwrite($this->file, '	</CstmrCdtTrfInitn>' . $CrLf);
-				fwrite($this->file, '</Document>' . $CrLf);
+				fwrite($this->file, '		</PmtInf>'.$CrLf);
+				fwrite($this->file, '	</CstmrCdtTrfInitn>'.$CrLf);
+				fwrite($this->file, '</Document>'.$CrLf);
 			}
 		}
 
@@ -1989,10 +1989,10 @@ 
 			if ($type != 'bank-transfer') {
 				$sql = "SELECT pl.amount";
 				$sql .= " FROM";
-				$sql .= " " . MAIN_DB_PREFIX . "prelevement_lignes as pl,";
-				$sql .= " " . MAIN_DB_PREFIX . "facture as f,";
-				$sql .= " " . MAIN_DB_PREFIX . "prelevement as p";
-				$sql .= " WHERE pl.fk_prelevement_bons = " . ((int) $this->id);
+				$sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+				$sql .= " ".MAIN_DB_PREFIX."facture as f,";
+				$sql .= " ".MAIN_DB_PREFIX."prelevement as p";
+				$sql .= " WHERE pl.fk_prelevement_bons = ".((int) $this->id);
 				$sql .= " AND pl.rowid = p.fk_prelevement_lignes";
 				$sql .= " AND p.fk_facture = f.rowid";
 
@@ -2015,10 +2015,10 @@ 
 			} else {
 				$sql = "SELECT pl.amount";
 				$sql .= " FROM";
-				$sql .= " " . MAIN_DB_PREFIX . "prelevement_lignes as pl,";
-				$sql .= " " . MAIN_DB_PREFIX . "facture_fourn as f,";
-				$sql .= " " . MAIN_DB_PREFIX . "prelevement as p";
-				$sql .= " WHERE pl.fk_prelevement_bons = " . ((int) $this->id);
+				$sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+				$sql .= " ".MAIN_DB_PREFIX."facture_fourn as f,";
+				$sql .= " ".MAIN_DB_PREFIX."prelevement as p";
+				$sql .= " WHERE pl.fk_prelevement_bons = ".((int) $this->id);
 				$sql .= " AND pl.rowid = p.fk_prelevement_lignes";
 				$sql .= " AND p.fk_facture_fourn = f.rowid";
 				// Lines
@@ -2067,7 +2067,7 @@ 
 		$pre = substr(dol_string_nospecial(dol_string_unaccent($langs->transnoentitiesnoconv('RUM'))), 0, 3); // Must always be on 3 char ('RUM' or 'UMR'. This is a protection against bad translation)
 
 		// 3 char + '-' + 12 + '-' + id + '-' + code 		Must be lower than 32.
-		return $pre . '-' . dol_print_date($row_datec, 'dayhourlogsmall') . '-' . dol_trunc($row_drum . ($row_code_client ? '-' . $row_code_client : ''), 13, 'right', 'UTF-8', 1);
+		return $pre.'-'.dol_print_date($row_datec, 'dayhourlogsmall').'-'.dol_trunc($row_drum.($row_code_client ? '-'.$row_code_client : ''), 13, 'right', 'UTF-8', 1);
 	}
 
 
@@ -2106,11 +2106,11 @@ 
 
 		// Raison Sociale Destinataire C2
 
-		fwrite($this->file, substr(strtoupper($client_nom) . "                         ", 0, 24));
+		fwrite($this->file, substr(strtoupper($client_nom)."                         ", 0, 24));
 
 		// Address optional D1
 		$address = strtr($rib_dom, array(" " => "-", chr(13) => " ", chr(10) => ""));
-		fwrite($this->file, substr($address . "                         ", 0, 24));
+		fwrite($this->file, substr($address."                         ", 0, 24));
 
 		// Zone Reservee D2
 
@@ -2122,17 +2122,17 @@ 
 
 		// Numero de compte D4
 
-		fwrite($this->file, substr("000000000000000" . $rib_number, -11));
+		fwrite($this->file, substr("000000000000000".$rib_number, -11));
 
 		// Zone E Montant
 
 		$montant = (round($amount, 2) * 100);
 
-		fwrite($this->file, substr("000000000000000" . $montant, -16));
+		fwrite($this->file, substr("000000000000000".$montant, -16));
 
 		// Label F
 
-		fwrite($this->file, substr("*_" . $ref . "_RDVnet" . $rowid . "                               ", 0, 31));
+		fwrite($this->file, substr("*_".$ref."_RDVnet".$rowid."                               ", 0, 31));
 
 		// Code etablissement G1
 
@@ -2183,7 +2183,7 @@ 
 			$row_somme = round((float) $row_somme, 2);
 		}
 
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		$CrLf = "\n";
 		$Rowing = sprintf("%010d", $row_idfac);
@@ -2198,59 +2198,59 @@ 
 		if ($type != 'bank-transfer') {
 			// SEPA Paiement Information of buyer for Direct Debit
 			$XML_DEBITOR = '';
-			$XML_DEBITOR .= '			<DrctDbtTxInf>' . $CrLf;
-			$XML_DEBITOR .= '				<PmtId>' . $CrLf;
+			$XML_DEBITOR .= '			<DrctDbtTxInf>'.$CrLf;
+			$XML_DEBITOR .= '				<PmtId>'.$CrLf;
 			// Add EndToEndId. Must be a unique ID for each payment (for example by including bank, buyer or seller, date, checksum)
-			$XML_DEBITOR .= '					<EndToEndId>' . ((getDolGlobalString('PRELEVEMENT_END_TO_END') != "") ? $conf->global->PRELEVEMENT_END_TO_END : ('DD-' . 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_DEBITOR .= '				</PmtId>' . $CrLf;
-			$XML_DEBITOR .= '				<InstdAmt Ccy="EUR">' . $row_somme . '</InstdAmt>' . $CrLf;
-			$XML_DEBITOR .= '				<DrctDbtTx>' . $CrLf;
-			$XML_DEBITOR .= '					<MndtRltdInf>' . $CrLf;
-			$XML_DEBITOR .= '						<MndtId>' . $Rum . '</MndtId>' . $CrLf;
-			$XML_DEBITOR .= '						<DtOfSgntr>' . $DtOfSgntr . '</DtOfSgntr>' . $CrLf;
-			$XML_DEBITOR .= '						<AmdmntInd>false</AmdmntInd>' . $CrLf;
-			$XML_DEBITOR .= '					</MndtRltdInf>' . $CrLf;
-			$XML_DEBITOR .= '				</DrctDbtTx>' . $CrLf;
-			$XML_DEBITOR .= '				<DbtrAgt>' . $CrLf;
-			$XML_DEBITOR .= '					<FinInstnId>' . $CrLf;
-			$XML_DEBITOR .= '						<BIC>' . $row_bic . '</BIC>' . $CrLf;
-			$XML_DEBITOR .= '					</FinInstnId>' . $CrLf;
-			$XML_DEBITOR .= '				</DbtrAgt>' . $CrLf;
-			$XML_DEBITOR .= '				<Dbtr>' . $CrLf;
-			$XML_DEBITOR .= '					<Nm>' . dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($row_nom), ' '))) . '</Nm>' . $CrLf;
-			$XML_DEBITOR .= '					<PstlAdr>' . $CrLf;
-			$XML_DEBITOR .= '						<Ctry>' . $row_country_code . '</Ctry>' . $CrLf;
+			$XML_DEBITOR .= '					<EndToEndId>'.((getDolGlobalString('PRELEVEMENT_END_TO_END') != "") ? $conf->global->PRELEVEMENT_END_TO_END : ('DD-'.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_DEBITOR .= '				</PmtId>'.$CrLf;
+			$XML_DEBITOR .= '				<InstdAmt Ccy="EUR">'.$row_somme.'</InstdAmt>'.$CrLf;
+			$XML_DEBITOR .= '				<DrctDbtTx>'.$CrLf;
+			$XML_DEBITOR .= '					<MndtRltdInf>'.$CrLf;
+			$XML_DEBITOR .= '						<MndtId>'.$Rum.'</MndtId>'.$CrLf;
+			$XML_DEBITOR .= '						<DtOfSgntr>'.$DtOfSgntr.'</DtOfSgntr>'.$CrLf;
+			$XML_DEBITOR .= '						<AmdmntInd>false</AmdmntInd>'.$CrLf;
+			$XML_DEBITOR .= '					</MndtRltdInf>'.$CrLf;
+			$XML_DEBITOR .= '				</DrctDbtTx>'.$CrLf;
+			$XML_DEBITOR .= '				<DbtrAgt>'.$CrLf;
+			$XML_DEBITOR .= '					<FinInstnId>'.$CrLf;
+			$XML_DEBITOR .= '						<BIC>'.$row_bic.'</BIC>'.$CrLf;
+			$XML_DEBITOR .= '					</FinInstnId>'.$CrLf;
+			$XML_DEBITOR .= '				</DbtrAgt>'.$CrLf;
+			$XML_DEBITOR .= '				<Dbtr>'.$CrLf;
+			$XML_DEBITOR .= '					<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($row_nom), ' '))).'</Nm>'.$CrLf;
+			$XML_DEBITOR .= '					<PstlAdr>'.$CrLf;
+			$XML_DEBITOR .= '						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
 			$addressline1 = strtr($row_address, array(chr(13) => ", ", chr(10) => ""));
-			$addressline2 = strtr($row_zip . (($row_zip && $row_town) ? ' ' : (string) $row_town), array(chr(13) => ", ", chr(10) => ""));
+			$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : (string) $row_town), array(chr(13) => ", ", chr(10) => ""));
 			if (trim($addressline1)) {
-				$XML_DEBITOR .= '						<AdrLine>' . dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)) . '</AdrLine>' . $CrLf;
+				$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
 			if (trim($addressline2)) {
-				$XML_DEBITOR .= '						<AdrLine>' . dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline2), ' '), 70, 'right', 'UTF-8', 1)) . '</AdrLine>' . $CrLf;
+				$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline2), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
-			$XML_DEBITOR .= '					</PstlAdr>' . $CrLf;
-			$XML_DEBITOR .= '				</Dbtr>' . $CrLf;
-			$XML_DEBITOR .= '				<DbtrAcct>' . $CrLf;
-			$XML_DEBITOR .= '					<Id>' . $CrLf;
-			$XML_DEBITOR .= '						<IBAN>' . preg_replace('/\s/', '', $row_iban) . '</IBAN>' . $CrLf;
-			$XML_DEBITOR .= '					</Id>' . $CrLf;
-			$XML_DEBITOR .= '				</DbtrAcct>' . $CrLf;
-			$XML_DEBITOR .= '				<RmtInf>' . $CrLf;
+			$XML_DEBITOR .= '					</PstlAdr>'.$CrLf;
+			$XML_DEBITOR .= '				</Dbtr>'.$CrLf;
+			$XML_DEBITOR .= '				<DbtrAcct>'.$CrLf;
+			$XML_DEBITOR .= '					<Id>'.$CrLf;
+			$XML_DEBITOR .= '						<IBAN>'.preg_replace('/\s/', '', $row_iban).'</IBAN>'.$CrLf;
+			$XML_DEBITOR .= '					</Id>'.$CrLf;
+			$XML_DEBITOR .= '				</DbtrAcct>'.$CrLf;
+			$XML_DEBITOR .= '				<RmtInf>'.$CrLf;
 			// A string with some information on payment - 140 max
-			$XML_DEBITOR .= '					<Ustrd>' . getDolGlobalString('PRELEVEMENT_USTRD', dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($row_ref . ($row_comment ? ' - ' . $row_comment : '')), '', '', '', 1), 135, 'right', 'UTF-8', 1))) . '</Ustrd>' . $CrLf; // Free unstuctured data - 140 max
-			$XML_DEBITOR .= '				</RmtInf>' . $CrLf;
-			$XML_DEBITOR .= '			</DrctDbtTxInf>' . $CrLf;
+			$XML_DEBITOR .= '					<Ustrd>'.getDolGlobalString('PRELEVEMENT_USTRD', dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($row_ref.($row_comment ? ' - '.$row_comment : '')), '', '', '', 1), 135, 'right', 'UTF-8', 1))).'</Ustrd>'.$CrLf; // Free unstuctured data - 140 max
+			$XML_DEBITOR .= '				</RmtInf>'.$CrLf;
+			$XML_DEBITOR .= '			</DrctDbtTxInf>'.$CrLf;
 			return $XML_DEBITOR;
 		} else {
 			// SEPA Payment Information of seller for Credit Transfer
 			$XML_CREDITOR = '';
-			$XML_CREDITOR .= '			<CdtTrfTxInf>' . $CrLf;
-			$XML_CREDITOR .= '				<PmtId>' . $CrLf;
+			$XML_CREDITOR .= '			<CdtTrfTxInf>'.$CrLf;
+			$XML_CREDITOR .= '				<PmtId>'.$CrLf;
 			// Add EndToEndId. Must be a unique ID for each payment (for example by including bank, buyer or seller, date, checksum)
-			$XML_CREDITOR .= '					<EndToEndId>' . ((getDolGlobalString('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;
+			$XML_CREDITOR .= '					<EndToEndId>'.((getDolGlobalString('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 (getDolGlobalString('PAYMENTBYBANKTRANSFER_FORCE_HIGH_PRIORITY')) {
@@ -2258,18 +2258,18 @@ 
 				} 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 .= '				<Amt>'.$CrLf;
 			$XML_CREDITOR .= '				<InstdAmt Ccy="EUR">'.round((float) $row_somme, 2).'</InstdAmt>'.$CrLf;
-			$XML_CREDITOR .= '				</Amt>' . $CrLf;
+			$XML_CREDITOR .= '				</Amt>'.$CrLf;
 			/*
 			 $XML_CREDITOR .= '				<DrctDbtTx>'.$CrLf;
 			 $XML_CREDITOR .= '					<MndtRltdInf>'.$CrLf;
@@ -2280,35 +2280,35 @@ 
 			 $XML_CREDITOR .= '				</DrctDbtTx>'.$CrLf;
 			 */
 			//$XML_CREDITOR .= '				<ChrgBr>SLEV</ChrgBr>'.$CrLf;
-			$XML_CREDITOR .= '				<CdtrAgt>' . $CrLf;
-			$XML_CREDITOR .= '					<FinInstnId>' . $CrLf;
-			$XML_CREDITOR .= '						<BIC>' . $row_bic . '</BIC>' . $CrLf;
-			$XML_CREDITOR .= '					</FinInstnId>' . $CrLf;
-			$XML_CREDITOR .= '				</CdtrAgt>' . $CrLf;
-			$XML_CREDITOR .= '				<Cdtr>' . $CrLf;
-			$XML_CREDITOR .= '					<Nm>' . dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($row_nom), ' '))) . '</Nm>' . $CrLf;
-			$XML_CREDITOR .= '					<PstlAdr>' . $CrLf;
-			$XML_CREDITOR .= '						<Ctry>' . $row_country_code . '</Ctry>' . $CrLf;
+			$XML_CREDITOR .= '				<CdtrAgt>'.$CrLf;
+			$XML_CREDITOR .= '					<FinInstnId>'.$CrLf;
+			$XML_CREDITOR .= '						<BIC>'.$row_bic.'</BIC>'.$CrLf;
+			$XML_CREDITOR .= '					</FinInstnId>'.$CrLf;
+			$XML_CREDITOR .= '				</CdtrAgt>'.$CrLf;
+			$XML_CREDITOR .= '				<Cdtr>'.$CrLf;
+			$XML_CREDITOR .= '					<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($row_nom), ' '))).'</Nm>'.$CrLf;
+			$XML_CREDITOR .= '					<PstlAdr>'.$CrLf;
+			$XML_CREDITOR .= '						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
 			$addressline1 = strtr($row_address, array(chr(13) => ", ", chr(10) => ""));
-			$addressline2 = strtr($row_zip . (($row_zip && $row_town) ? ' ' : (string) $row_town), array(chr(13) => ", ", chr(10) => ""));
+			$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : (string) $row_town), array(chr(13) => ", ", chr(10) => ""));
 			if (trim($addressline1)) {
-				$XML_CREDITOR .= '						<AdrLine>' . dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)) . '</AdrLine>' . $CrLf;
+				$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
 			if (trim($addressline2)) {
-				$XML_CREDITOR .= '						<AdrLine>' . dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline2), ' '), 70, 'right', 'UTF-8', 1)) . '</AdrLine>' . $CrLf;
+				$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline2), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
-			$XML_CREDITOR .= '					</PstlAdr>' . $CrLf;
-			$XML_CREDITOR .= '				</Cdtr>' . $CrLf;
-			$XML_CREDITOR .= '				<CdtrAcct>' . $CrLf;
-			$XML_CREDITOR .= '					<Id>' . $CrLf;
-			$XML_CREDITOR .= '						<IBAN>' . preg_replace('/\s/', '', $row_iban) . '</IBAN>' . $CrLf;
-			$XML_CREDITOR .= '					</Id>' . $CrLf;
-			$XML_CREDITOR .= '				</CdtrAcct>' . $CrLf;
-			$XML_CREDITOR .= '				<RmtInf>' . $CrLf;
+			$XML_CREDITOR .= '					</PstlAdr>'.$CrLf;
+			$XML_CREDITOR .= '				</Cdtr>'.$CrLf;
+			$XML_CREDITOR .= '				<CdtrAcct>'.$CrLf;
+			$XML_CREDITOR .= '					<Id>'.$CrLf;
+			$XML_CREDITOR .= '						<IBAN>'.preg_replace('/\s/', '', $row_iban).'</IBAN>'.$CrLf;
+			$XML_CREDITOR .= '					</Id>'.$CrLf;
+			$XML_CREDITOR .= '				</CdtrAcct>'.$CrLf;
+			$XML_CREDITOR .= '				<RmtInf>'.$CrLf;
 			// A string with some information on payment - 140 max
-			$XML_CREDITOR .= '					<Ustrd>' . getDolGlobalString('CREDITTRANSFER_USTRD', dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($row_ref . ($row_comment ? ' - ' . $row_comment : '')), '', '', '', 1), 135, 'right', 'UTF-8', 1))) . '</Ustrd>' . $CrLf; // Free unstructured data - 140 max
-			$XML_CREDITOR .= '				</RmtInf>' . $CrLf;
-			$XML_CREDITOR .= '			</CdtTrfTxInf>' . $CrLf;
+			$XML_CREDITOR .= '					<Ustrd>'.getDolGlobalString('CREDITTRANSFER_USTRD', dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($row_ref.($row_comment ? ' - '.$row_comment : '')), '', '', '', 1), 135, 'right', 'UTF-8', 1))).'</Ustrd>'.$CrLf; // Free unstructured data - 140 max
+			$XML_CREDITOR .= '				</RmtInf>'.$CrLf;
+			$XML_CREDITOR .= '			</CdtTrfTxInf>'.$CrLf;
 			return $XML_CREDITOR;
 		}
 	}
@@ -2340,11 +2340,11 @@ 
 
 		// Raison Sociale C2
 
-		fwrite($this->file, substr($this->raison_sociale . "                           ", 0, 24));
+		fwrite($this->file, substr($this->raison_sociale."                           ", 0, 24));
 
 		// Ref of thirdparty on 7 characters
 
-		fwrite($this->file, substr($this->reference_remise . "                           ", 0, 7));
+		fwrite($this->file, substr($this->reference_remise."                           ", 0, 7));
 
 		// Zone Reservee D1-2
 
@@ -2362,7 +2362,7 @@ 
 
 		// Numero de compte D4
 
-		fwrite($this->file, substr("000000000000000" . $this->emetteur_numero_compte, -11));
+		fwrite($this->file, substr("000000000000000".$this->emetteur_numero_compte, -11));
 
 		// Zone Reservee E
 
@@ -2425,15 +2425,15 @@ 
 			$this->emetteur_iban = $account->iban;
 			$this->emetteur_bic = $account->bic;
 
-			$this->emetteur_ics = (($type == 'bank-transfer' && getDolGlobalString("SEPA_USE_IDS")) ? $account->ics_transfer : $account->ics);  // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+			$this->emetteur_ics = (($type == 'bank-transfer' && getDolGlobalString("SEPA_USE_IDS")) ? $account->ics_transfer : $account->ics); // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
 
 			$this->raison_sociale = $account->proprio;
 		}
 
 		// Get pending payments
 		$sql = "SELECT rowid, ref";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "prelevement_bons as pb";
-		$sql .= " WHERE pb.rowid = " . ((int) $this->id);
+		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as pb";
+		$sql .= " WHERE pb.rowid = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -2450,45 +2450,45 @@ 
 			if ($type != 'bank-transfer') {
 				// SEPA Paiement Information of my company for Direct Debit
 				$XML_SEPA_INFO = '';
-				$XML_SEPA_INFO .= '		<PmtInf>' . $CrLf;
-				$XML_SEPA_INFO .= '			<PmtInfId>' . ('DD/' . $dateTime_YMD . '/ID' . $IdBon . '-' . $RefBon) . '</PmtInfId>' . $CrLf;
-				$XML_SEPA_INFO .= '			<PmtMtd>DD</PmtMtd>' . $CrLf;
-				$XML_SEPA_INFO .= '			<NbOfTxs>' . $nombre . '</NbOfTxs>' . $CrLf;
-				$XML_SEPA_INFO .= '			<CtrlSum>' . $total . '</CtrlSum>' . $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 .= '			<ReqdColltnDt>' . $dateTime_ETAD . '</ReqdColltnDt>' . $CrLf;
-				$XML_SEPA_INFO .= '			<Cdtr>' . $CrLf;
-				$XML_SEPA_INFO .= '				<Nm>' . dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))) . '</Nm>' . $CrLf;
-				$XML_SEPA_INFO .= '				<PstlAdr>' . $CrLf;
-				$XML_SEPA_INFO .= '					<Ctry>' . $country[1] . '</Ctry>' . $CrLf;
+				$XML_SEPA_INFO .= '		<PmtInf>'.$CrLf;
+				$XML_SEPA_INFO .= '			<PmtInfId>'.('DD/'.$dateTime_YMD.'/ID'.$IdBon.'-'.$RefBon).'</PmtInfId>'.$CrLf;
+				$XML_SEPA_INFO .= '			<PmtMtd>DD</PmtMtd>'.$CrLf;
+				$XML_SEPA_INFO .= '			<NbOfTxs>'.$nombre.'</NbOfTxs>'.$CrLf;
+				$XML_SEPA_INFO .= '			<CtrlSum>'.$total.'</CtrlSum>'.$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 .= '			<ReqdColltnDt>'.$dateTime_ETAD.'</ReqdColltnDt>'.$CrLf;
+				$XML_SEPA_INFO .= '			<Cdtr>'.$CrLf;
+				$XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf;
+				$XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
+				$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
 				$addressline1 = strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(chr(13) => ", ", chr(10) => ""));
-				$addressline2 = strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP . (($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' ' . $configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '') . $configuration->global->MAIN_INFO_SOCIETE_TOWN, array(chr(13) => ", ", chr(10) => ""));
+				$addressline2 = strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(chr(13) => ", ", chr(10) => ""));
 				if ($addressline1) {
-					$XML_SEPA_INFO .= '					<AdrLine>' . dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)) . '</AdrLine>' . $CrLf;
+					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
 				if ($addressline2) {
-					$XML_SEPA_INFO .= '					<AdrLine>' . dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline2), ' '), 70, 'right', 'UTF-8', 1)) . '</AdrLine>' . $CrLf;
+					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline2), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
-				$XML_SEPA_INFO .= '				</PstlAdr>' . $CrLf;
-				$XML_SEPA_INFO .= '			</Cdtr>' . $CrLf;
-				$XML_SEPA_INFO .= '			<CdtrAcct>' . $CrLf;
-				$XML_SEPA_INFO .= '				<Id>' . $CrLf;
-				$XML_SEPA_INFO .= '					<IBAN>' . preg_replace('/\s/', '', $this->emetteur_iban) . '</IBAN>' . $CrLf;
-				$XML_SEPA_INFO .= '				</Id>' . $CrLf;
-				$XML_SEPA_INFO .= '			</CdtrAcct>' . $CrLf;
-				$XML_SEPA_INFO .= '			<CdtrAgt>' . $CrLf;
-				$XML_SEPA_INFO .= '				<FinInstnId>' . $CrLf;
-				$XML_SEPA_INFO .= '					<BIC>' . $this->emetteur_bic . '</BIC>' . $CrLf;
-				$XML_SEPA_INFO .= '				</FinInstnId>' . $CrLf;
-				$XML_SEPA_INFO .= '			</CdtrAgt>' . $CrLf;
+				$XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
+				$XML_SEPA_INFO .= '			</Cdtr>'.$CrLf;
+				$XML_SEPA_INFO .= '			<CdtrAcct>'.$CrLf;
+				$XML_SEPA_INFO .= '				<Id>'.$CrLf;
+				$XML_SEPA_INFO .= '					<IBAN>'.preg_replace('/\s/', '', $this->emetteur_iban).'</IBAN>'.$CrLf;
+				$XML_SEPA_INFO .= '				</Id>'.$CrLf;
+				$XML_SEPA_INFO .= '			</CdtrAcct>'.$CrLf;
+				$XML_SEPA_INFO .= '			<CdtrAgt>'.$CrLf;
+				$XML_SEPA_INFO .= '				<FinInstnId>'.$CrLf;
+				$XML_SEPA_INFO .= '					<BIC>'.$this->emetteur_bic.'</BIC>'.$CrLf;
+				$XML_SEPA_INFO .= '				</FinInstnId>'.$CrLf;
+				$XML_SEPA_INFO .= '			</CdtrAgt>'.$CrLf;
 				/* $XML_SEPA_INFO .= '			<UltmtCdtr>'.$CrLf;
 				 $XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf;
 				 $XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
@@ -2497,64 +2497,64 @@ 
 				 $XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				 $XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
 				 $XML_SEPA_INFO .= '			</UltmtCdtr>'.$CrLf;*/
-				$XML_SEPA_INFO .= '			<ChrgBr>SLEV</ChrgBr>' . $CrLf; // Field "Responsible of fees". Must be SLEV
-				$XML_SEPA_INFO .= '			<CdtrSchmeId>' . $CrLf;
-				$XML_SEPA_INFO .= '				<Id>' . $CrLf;
-				$XML_SEPA_INFO .= '					<PrvtId>' . $CrLf;
-				$XML_SEPA_INFO .= '						<Othr>' . $CrLf;
-				$XML_SEPA_INFO .= '							<Id>' . $this->emetteur_ics . '</Id>' . $CrLf;
-				$XML_SEPA_INFO .= '							<SchmeNm>' . $CrLf;
-				$XML_SEPA_INFO .= '								<Prtry>SEPA</Prtry>' . $CrLf;
-				$XML_SEPA_INFO .= '							</SchmeNm>' . $CrLf;
-				$XML_SEPA_INFO .= '						</Othr>' . $CrLf;
-				$XML_SEPA_INFO .= '					</PrvtId>' . $CrLf;
-				$XML_SEPA_INFO .= '				</Id>' . $CrLf;
-				$XML_SEPA_INFO .= '			</CdtrSchmeId>' . $CrLf;
+				$XML_SEPA_INFO .= '			<ChrgBr>SLEV</ChrgBr>'.$CrLf; // Field "Responsible of fees". Must be SLEV
+				$XML_SEPA_INFO .= '			<CdtrSchmeId>'.$CrLf;
+				$XML_SEPA_INFO .= '				<Id>'.$CrLf;
+				$XML_SEPA_INFO .= '					<PrvtId>'.$CrLf;
+				$XML_SEPA_INFO .= '						<Othr>'.$CrLf;
+				$XML_SEPA_INFO .= '							<Id>'.$this->emetteur_ics.'</Id>'.$CrLf;
+				$XML_SEPA_INFO .= '							<SchmeNm>'.$CrLf;
+				$XML_SEPA_INFO .= '								<Prtry>SEPA</Prtry>'.$CrLf;
+				$XML_SEPA_INFO .= '							</SchmeNm>'.$CrLf;
+				$XML_SEPA_INFO .= '						</Othr>'.$CrLf;
+				$XML_SEPA_INFO .= '					</PrvtId>'.$CrLf;
+				$XML_SEPA_INFO .= '				</Id>'.$CrLf;
+				$XML_SEPA_INFO .= '			</CdtrSchmeId>'.$CrLf;
 			} else {
 				// SEPA Paiement Information of my company for Credit Transfer
 				$XML_SEPA_INFO = '';
-				$XML_SEPA_INFO .= '		<PmtInf>' . $CrLf;
-				$XML_SEPA_INFO .= '			<PmtInfId>' . ('TRF/' . $dateTime_YMD . '/ID' . $IdBon . '-' . $RefBon) . '</PmtInfId>' . $CrLf;
-				$XML_SEPA_INFO .= '			<PmtMtd>TRF</PmtMtd>' . $CrLf;
+				$XML_SEPA_INFO .= '		<PmtInf>'.$CrLf;
+				$XML_SEPA_INFO .= '			<PmtInfId>'.('TRF/'.$dateTime_YMD.'/ID'.$IdBon.'-'.$RefBon).'</PmtInfId>'.$CrLf;
+				$XML_SEPA_INFO .= '			<PmtMtd>TRF</PmtMtd>'.$CrLf;
 				//$XML_SEPA_INFO .= '			<BtchBookg>False</BtchBookg>'.$CrLf;
-				$XML_SEPA_INFO .= '			<NbOfTxs>' . $nombre . '</NbOfTxs>' . $CrLf;
-				$XML_SEPA_INFO .= '			<CtrlSum>' . $total . '</CtrlSum>' . $CrLf;
+				$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;
-				$XML_SEPA_INFO .= '				<Nm>' . dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))) . '</Nm>' . $CrLf;
-				$XML_SEPA_INFO .= '				<PstlAdr>' . $CrLf;
-				$XML_SEPA_INFO .= '					<Ctry>' . $country[1] . '</Ctry>' . $CrLf;
+				$XML_SEPA_INFO .= '			<ReqdExctnDt>'.dol_print_date($dateTime_ETAD, 'dayrfc').'</ReqdExctnDt>'.$CrLf;
+				$XML_SEPA_INFO .= '			<Dbtr>'.$CrLf;
+				$XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf;
+				$XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
+				$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
 				$addressline1 = strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(chr(13) => ", ", chr(10) => ""));
-				$addressline2 = strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP . (($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' ' . $configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '') . $configuration->global->MAIN_INFO_SOCIETE_TOWN, array(chr(13) => ", ", chr(10) => ""));
+				$addressline2 = strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(chr(13) => ", ", chr(10) => ""));
 				if ($addressline1) {
-					$XML_SEPA_INFO .= '					<AdrLine>' . dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)) . '</AdrLine>' . $CrLf;
+					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
 				if ($addressline2) {
-					$XML_SEPA_INFO .= '					<AdrLine>' . dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline2), ' '), 70, 'right', 'UTF-8', 1)) . '</AdrLine>' . $CrLf;
+					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline2), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
-				$XML_SEPA_INFO .= '				</PstlAdr>' . $CrLf;
-				$XML_SEPA_INFO .= '			</Dbtr>' . $CrLf;
-				$XML_SEPA_INFO .= '			<DbtrAcct>' . $CrLf;
-				$XML_SEPA_INFO .= '				<Id>' . $CrLf;
-				$XML_SEPA_INFO .= '					<IBAN>' . preg_replace('/\s/', '', $this->emetteur_iban) . '</IBAN>' . $CrLf;
-				$XML_SEPA_INFO .= '				</Id>' . $CrLf;
-				$XML_SEPA_INFO .= '			</DbtrAcct>' . $CrLf;
-				$XML_SEPA_INFO .= '			<DbtrAgt>' . $CrLf;
-				$XML_SEPA_INFO .= '				<FinInstnId>' . $CrLf;
-				$XML_SEPA_INFO .= '					<BIC>' . $this->emetteur_bic . '</BIC>' . $CrLf;
-				$XML_SEPA_INFO .= '				</FinInstnId>' . $CrLf;
-				$XML_SEPA_INFO .= '			</DbtrAgt>' . $CrLf;
+				$XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
+				$XML_SEPA_INFO .= '			</Dbtr>'.$CrLf;
+				$XML_SEPA_INFO .= '			<DbtrAcct>'.$CrLf;
+				$XML_SEPA_INFO .= '				<Id>'.$CrLf;
+				$XML_SEPA_INFO .= '					<IBAN>'.preg_replace('/\s/', '', $this->emetteur_iban).'</IBAN>'.$CrLf;
+				$XML_SEPA_INFO .= '				</Id>'.$CrLf;
+				$XML_SEPA_INFO .= '			</DbtrAcct>'.$CrLf;
+				$XML_SEPA_INFO .= '			<DbtrAgt>'.$CrLf;
+				$XML_SEPA_INFO .= '				<FinInstnId>'.$CrLf;
+				$XML_SEPA_INFO .= '					<BIC>'.$this->emetteur_bic.'</BIC>'.$CrLf;
+				$XML_SEPA_INFO .= '				</FinInstnId>'.$CrLf;
+				$XML_SEPA_INFO .= '			</DbtrAgt>'.$CrLf;
 				/* $XML_SEPA_INFO .= '			<UltmtCdtr>'.$CrLf;
 				 $XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf;
 				 $XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
@@ -2563,7 +2563,7 @@ 
 				 $XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				 $XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
 				 $XML_SEPA_INFO .= '			</UltmtCdtr>'.$CrLf;*/
-				$XML_SEPA_INFO .= '			<ChrgBr>SLEV</ChrgBr>' . $CrLf; // Field "Responsible of fees". Must be SLEV
+				$XML_SEPA_INFO .= '			<ChrgBr>SLEV</ChrgBr>'.$CrLf; // Field "Responsible of fees". Must be SLEV
 				/*$XML_SEPA_INFO .= '			<CdtrSchmeId>'.$CrLf;
 				 $XML_SEPA_INFO .= '				<Id>'.$CrLf;
 				 $XML_SEPA_INFO .= '					<PrvtId>'.$CrLf;
@@ -2578,7 +2578,7 @@ 
 				 $XML_SEPA_INFO .= '			</CdtrSchmeId>'.$CrLf;*/
 			}
 		} else {
-			fwrite($this->file, 'INCORRECT EMETTEUR ' . $this->raison_sociale . $CrLf);
+			fwrite($this->file, 'INCORRECT EMETTEUR '.$this->raison_sociale.$CrLf);
 			$XML_SEPA_INFO = '';
 		}
 		return $XML_SEPA_INFO;
@@ -2630,7 +2630,7 @@ 
 
 		$montant = ($total * 100);
 
-		fwrite($this->file, substr("000000000000000" . $montant, -16));
+		fwrite($this->file, substr("000000000000000".$montant, -16));
 
 		// Zone Reservee F
 
@@ -2787,18 +2787,18 @@ 
 		$return .= img_picto('', $this->picto);
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">' . (method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref) . '</span>';
+		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
 		if ($selected >= 0) {
-			$return .= '<input id="cb' . $this->id . '" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="' . $this->id . '"' . ($selected ? ' checked="checked"' : '') . '>';
+			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		if (property_exists($this, 'date_echeance')) {
-			$return .= '<br><span class="opacitymedium">' . $langs->trans("Date") . '</span> : <span class="info-box-label">' . dol_print_date($this->db->jdate($this->date_echeance), 'day') . '</span>';
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Date").'</span> : <span class="info-box-label">'.dol_print_date($this->db->jdate($this->date_echeance), 'day').'</span>';
 		}
 		if (property_exists($this, 'total')) {
-			$return .= '<br><span class="opacitymedium">' . $langs->trans("Amount") . '</span> : <span class="amount">' . price($this->total) . '</span>';
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="amount">'.price($this->total).'</span>';
 		}
 		if (method_exists($this, 'LibStatut')) {
-			$return .= '<br><div class="info-box-status">' . $this->getLibStatut(3) . '</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -2819,9 +2819,9 @@ 
 			return 0;
 		}
 		if ($id) {
-			$sql = "SELECT COUNT(*) AS nb FROM " . MAIN_DB_PREFIX . "prelevement_lignes";
-			$sql .= " WHERE fk_prelevement_bons = " . ((int) $id);
-			$sql .= " AND fk_soc = 0";	// fk_soc can't be NULL
+			$sql = "SELECT COUNT(*) AS nb FROM ".MAIN_DB_PREFIX."prelevement_lignes";
+			$sql .= " WHERE fk_prelevement_bons = ".((int) $id);
+			$sql .= " AND fk_soc = 0"; // fk_soc can't be NULL
 			$sql .= " AND fk_user IS NOT NULL";
 
 			$num = 0;

htdocs/user/list.php

Spacing +5 added lines, -5 removed lines

@@ -152,11 +152,11 @@ 
 }
 
 // Extra fields
-include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 // Init search fields
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -475,7 +475,7 @@ 
 			if ($searchCategoryUserOperator == 0) {
 				$searchCategoryUserSqlList[] = " EXISTS (SELECT ck.fk_user FROM ".MAIN_DB_PREFIX."categorie_user as ck WHERE u.rowid = ck.fk_user AND ck.fk_categorie = ".((int) $searchCategoryUser).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryUser);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryUser);
 			}
 		}
 	}
@@ -996,7 +996,7 @@ 
 	}
 
 	if (empty($obj->country_code)) {
-		$obj->country_code = '';		// TODO Add join in select with country table to get country_code
+		$obj->country_code = ''; // TODO Add join in select with country table to get country_code
 	}
 
 	// Store properties in $object
@@ -1202,7 +1202,7 @@ 
 			if ($api_key) {
 				if ($canreadsecretapi) {
 					print '<span class="opacitymedium">';
-					print showValueWithClipboardCPButton($object->api_key, 1, dol_trunc($api_key, 3));		// TODO Add an option to also reveal the hash, not only copy paste
+					print showValueWithClipboardCPButton($object->api_key, 1, dol_trunc($api_key, 3)); // TODO Add an option to also reveal the hash, not only copy paste
 					print '</span>';
 				} else {
 					print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';