Dolibarr / dolibarr

htdocs/core/search_page.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 $title = $langs->trans("Search");
 
 // URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests
-$head = '<!-- Quick access -->'."\n";	// This is used by DoliDroid to know page is a search page
+$head = '<!-- Quick access -->'."\n"; // This is used by DoliDroid to know page is a search page
 $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);

htdocs/reception/document.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 }
 $result = restrictedArea($user, 'reception', $object->id, '');
 
-$permissiontoadd = $user->rights->reception->creer;	// Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->rights->reception->creer; // Used by the include of actions_dellink.inc.php
 
 
 /*

htdocs/core/class/html.formmargin.class.php

Spacing +32 added lines, -32 removed lines

@@ -213,20 +213,20 @@ 
 
 		$marginInfo = $this->getMarginInfosArray($object, $force_price);
 
-		$parameters=array('marginInfo'=>&$marginInfo);
+		$parameters = array('marginInfo'=>&$marginInfo);
 		$reshook = $hookmanager->executeHooks('displayMarginInfos', $parameters, $object, $action);
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
 			if (!empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON)) {    // TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
-				print $langs->trans('ShowMarginInfos') . ' : ';
+				print $langs->trans('ShowMarginInfos').' : ';
 				$hidemargininfos = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW']); // Clean cookie
-				print '<span id="showMarginInfos" class="linkobject ' . (!empty($hidemargininfos) ? '' : 'hideobject') . '">' . img_picto($langs->trans("Disabled"), 'switch_off') . '</span>';
-				print '<span id="hideMarginInfos" class="linkobject ' . (!empty($hidemargininfos) ? 'hideobject' : '') . '">' . img_picto($langs->trans("Enabled"), 'switch_on') . '</span>';
+				print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? '' : 'hideobject').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</span>';
+				print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? 'hideobject' : '').'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</span>';
 
 				print '<script>$(document).ready(function() {
-        	    $("span#showMarginInfos").click(function() { $.getScript( "' . dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1) . '", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
-        	    $("span#hideMarginInfos").click(function() { $.getScript( "' . dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1) . '", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});
+        	    $("span#showMarginInfos").click(function() { $.getScript( "' . dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
+        	    $("span#hideMarginInfos").click(function() { $.getScript( "' . dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});
       	        });</script>';
 				if (!empty($hidemargininfos)) {
 					print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
@@ -234,68 +234,68 @@ 
 			}
 
 			print '<div class="div-table-responsive-no-min">';
-			print '<!-- Margin table -->' . "\n";
+			print '<!-- Margin table -->'."\n";
 
 			print '<table class="noborder margintable centpercent">';
 			print '<tr class="liste_titre">';
-			print '<td class="liste_titre">' . $langs->trans('Margins') . '</td>';
-			print '<td class="liste_titre right">' . $langs->trans('SellingPrice') . '</td>';
+			print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
+			print '<td class="liste_titre right">'.$langs->trans('SellingPrice').'</td>';
 			if ($conf->global->MARGIN_TYPE == "1") {
-				print '<td class="liste_titre right">' . $langs->trans('BuyingPrice') . '</td>';
+				print '<td class="liste_titre right">'.$langs->trans('BuyingPrice').'</td>';
 			} else {
-				print '<td class="liste_titre right">' . $langs->trans('CostPrice') . '</td>';
+				print '<td class="liste_titre right">'.$langs->trans('CostPrice').'</td>';
 			}
-			print '<td class="liste_titre right">' . $langs->trans('Margin') . '</td>';
+			print '<td class="liste_titre right">'.$langs->trans('Margin').'</td>';
 			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
-				print '<td class="liste_titre right">' . $langs->trans('MarginRate') . '</td>';
+				print '<td class="liste_titre right">'.$langs->trans('MarginRate').'</td>';
 			}
 			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
-				print '<td class="liste_titre right">' . $langs->trans('MarkRate') . '</td>';
+				print '<td class="liste_titre right">'.$langs->trans('MarkRate').'</td>';
 			}
 			print '</tr>';
 
 			if (!empty($conf->product->enabled)) {
 				//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
 				print '<tr class="oddeven">';
-				print '<td>' . $langs->trans('MarginOnProducts') . '</td>';
-				print '<td class="right">' . price($marginInfo['pv_products']) . '</td>';
-				print '<td class="right">' . price($marginInfo['pa_products']) . '</td>';
-				print '<td class="right">' . price($marginInfo['margin_on_products']) . '</td>';
+				print '<td>'.$langs->trans('MarginOnProducts').'</td>';
+				print '<td class="right">'.price($marginInfo['pv_products']).'</td>';
+				print '<td class="right">'.price($marginInfo['pa_products']).'</td>';
+				print '<td class="right">'.price($marginInfo['margin_on_products']).'</td>';
 				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
-					print '<td class="right">' . (($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">'.(($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], null, null, null, null, 2).'%').'</td>';
 				}
 				if (!empty($conf->global->DISPLAY_MARK_RATES)) {
-					print '<td class="right">' . (($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">'.(($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], null, null, null, null, 2).'%').'</td>';
 				}
 				print '</tr>';
 			}
 
 			if (!empty($conf->service->enabled)) {
 				print '<tr class="oddeven">';
-				print '<td>' . $langs->trans('MarginOnServices') . '</td>';
-				print '<td class="right">' . price($marginInfo['pv_services']) . '</td>';
-				print '<td class="right">' . price($marginInfo['pa_services']) . '</td>';
-				print '<td class="right">' . price($marginInfo['margin_on_services']) . '</td>';
+				print '<td>'.$langs->trans('MarginOnServices').'</td>';
+				print '<td class="right">'.price($marginInfo['pv_services']).'</td>';
+				print '<td class="right">'.price($marginInfo['pa_services']).'</td>';
+				print '<td class="right">'.price($marginInfo['margin_on_services']).'</td>';
 				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
-					print '<td class="right">' . (($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">'.(($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], null, null, null, null, 2).'%').'</td>';
 				}
 				if (!empty($conf->global->DISPLAY_MARK_RATES)) {
-					print '<td class="right">' . (($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">'.(($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], null, null, null, null, 2).'%').'</td>';
 				}
 				print '</tr>';
 			}
 
 			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
 				print '<tr class="liste_total">';
-				print '<td>' . $langs->trans('TotalMargin') . '</td>';
-				print '<td class="right">' . price($marginInfo['pv_total']) . '</td>';
-				print '<td class="right">' . price($marginInfo['pa_total']) . '</td>';
-				print '<td class="right">' . price($marginInfo['total_margin']) . '</td>';
+				print '<td>'.$langs->trans('TotalMargin').'</td>';
+				print '<td class="right">'.price($marginInfo['pv_total']).'</td>';
+				print '<td class="right">'.price($marginInfo['pa_total']).'</td>';
+				print '<td class="right">'.price($marginInfo['total_margin']).'</td>';
 				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
-					print '<td class="right">' . (($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
 				}
 				if (!empty($conf->global->DISPLAY_MARK_RATES)) {
-					print '<td class="right">' . (($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
 				}
 				print '</tr>';
 			}

htdocs/core/lib/bank.lib.php

Spacing +1 added lines, -1 removed lines

@@ -277,7 +277,7 @@
 {
 	require_once DOL_DOCUMENT_ROOT.'/includes/php-iban/oophp-iban.php';
 
-	$ibantocheck = ($account->iban ? $account->iban : $account->iban_prefix);		// iban or iban_prefix for backward compatibility
+	$ibantocheck = ($account->iban ? $account->iban : $account->iban_prefix); // iban or iban_prefix for backward compatibility
 
 	$iban = new IBAN($ibantocheck);
 	$check = $iban->Verify();

htdocs/accountancy/closure/index.php

Spacing +4 added lines, -4 removed lines

@@ -87,9 +87,9 @@ 
 	// Specify as export : update field date_validated on selected month/year
 	$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
 	$sql .= " SET date_validated = '".$db->idate($now)."'";
-	$sql .= " WHERE entity = " . ((int) $conf->entity);
-	$sql .= " AND doc_date >= '" . $db->idate($date_start) . "'";
-	$sql .= " AND doc_date <= '" . $db->idate($date_end) . "'";
+	$sql .= " WHERE entity = ".((int) $conf->entity);
+	$sql .= " AND doc_date >= '".$db->idate($date_start)."'";
+	$sql .= " AND doc_date <= '".$db->idate($date_end)."'";
 	$sql .= " AND date_validated IS NULL";
 
 	dol_syslog("/accountancy/closure/index.php action=validate_movement_confirm -> Set movements as validated", LOG_DEBUG);
@@ -122,7 +122,7 @@ 
 
 $title = $langs->trans('Closure');
 
-$help_url ='EN:Module_Double_Entry_Accounting';
+$help_url = 'EN:Module_Double_Entry_Accounting';
 
 llxHeader('', $title, $help_url);
 

htdocs/accountancy/bookkeeping/balance.php

Spacing +12 added lines, -12 removed lines

@@ -71,7 +71,7 @@ 
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new BookKeeping($db);
-$hookmanager->initHooks(array('balancelist'));  // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('balancelist')); // Note that conf->hooks_modules contains array
 
 $formaccounting = new FormAccounting($db);
 $formother = new FormOther($db);
@@ -343,9 +343,9 @@ 
 	// without time and class limits (Class 6 and 7 accounts ???) and does not take into account the "a-nouveau" journal.
 	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
 		$sql = "SELECT t.numero_compte, (SUM(t.debit) - SUM(t.credit)) as opening_balance";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
-		$sql .= " WHERE t.entity = " . $conf->entity;        // Never do sharing into accounting features
-		$sql .= " AND t.doc_date < '" . $db->idate($search_date_start) . "'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as t";
+		$sql .= " WHERE t.entity = ".$conf->entity; // Never do sharing into accounting features
+		$sql .= " AND t.doc_date < '".$db->idate($search_date_start)."'";
 		$sql .= " GROUP BY t.numero_compte";
 
 		$resql = $db->query($sql);
@@ -353,7 +353,7 @@ 
 		$opening_balances = array();
 		for ($i = 0; $i < $nrows; $i++) {
 			$arr = $resql->fetch_array();
-			$opening_balances["'" . $arr['numero_compte'] . "'"] = $arr['opening_balance'];
+			$opening_balances["'".$arr['numero_compte']."'"] = $arr['opening_balance'];
 		}
 	}
 
@@ -383,9 +383,9 @@ 
 		//var_dump($accounting_account);
 		//var_dump($accountingaccountstatic);
 		if (empty($accountingaccountstatic->label) && $accountingaccountstatic->id > 0) {
-			$link = '<a class="editfielda reposition" href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=update&token=' . newToken() . '&id=' . $accountingaccountstatic->id . '">' . img_edit() . '</a>';
+			$link = '<a class="editfielda reposition" href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=update&token='.newToken().'&id='.$accountingaccountstatic->id.'">'.img_edit().'</a>';
 		} elseif ($accounting_account == 'NotDefined') {
-			$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=create&token=' . newToken() . '&accountingaccount=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
+			$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=create&token='.newToken().'&accountingaccount='.length_accountg($line->numero_compte).'">'.img_edit_add().'</a>';
 		} elseif (empty($tmparrayforrootaccount['label'])) {
 			// $tmparrayforrootaccount['label'] not defined = the account has not parent with a parent.
 			// This is useless, we should not create a new account when an account has no parent, we must edit it to fix its parent.
@@ -417,7 +417,7 @@ 
 
 				// Show first line of a break
 				print '<tr class="trforbreak">';
-				print '<td colspan="'.($colspan+1).'" class="tdforbreak">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
+				print '<td colspan="'.($colspan + 1).'" class="tdforbreak">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
 				print '</tr>';
 
 				$displayed_account = $root_account_number;
@@ -472,9 +472,9 @@ 
 		print '<td class="right nowraponall amount">'.price(price2num($sous_total_debit, 'MT')).'</td>';
 		print '<td class="right nowraponall amount">'.price(price2num($sous_total_credit, 'MT')).'</td>';
 		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
-			print '<td class="right nowraponall amount">' . price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
+			print '<td class="right nowraponall amount">'.price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')).'</td>';
 		} else {
-			print '<td class="right nowraponall amount">' . price(price2num($sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
+			print '<td class="right nowraponall amount">'.price(price2num($sous_total_debit - $sous_total_credit, 'MT')).'</td>';
 		}
 		print "<td></td>\n";
 		print '</tr>';
@@ -487,9 +487,9 @@ 
 	print '<td class="right nowraponall amount">'.price(price2num($total_debit, 'MT')).'</td>';
 	print '<td class="right nowraponall amount">'.price(price2num($total_credit, 'MT')).'</td>';
 	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
-		print '<td class="right nowraponall amount">' . price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')) . '</td>';
+		print '<td class="right nowraponall amount">'.price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')).'</td>';
 	} else {
-		print '<td class="right nowraponall amount">' . price(price2num($total_debit - $total_credit, 'MT')) . '</td>';
+		print '<td class="right nowraponall amount">'.price(price2num($total_debit - $total_credit, 'MT')).'</td>';
 	}
 	print "<td></td>\n";
 	print '</tr>';

htdocs/holiday/month_report.php

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
 $sql .= " AND cp.statut = ".Holiday::STATUS_APPROVED;
 $sql .= " AND (";
 $sql .= " (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')";
-$sql .= " OR";	// For leave over several months
+$sql .= " OR"; // For leave over several months
 $sql .= " (date_format(cp.date_debut, '%Y-%m') < '".$db->escape($year_month)."' AND date_format(cp.date_fin, '%Y-%m') > '".$db->escape($year_month)."') ";
 $sql .= " )";
 if (!empty($search_ref)) {

htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php

Spacing +3 added lines, -3 removed lines

@@ -244,7 +244,7 @@ 
 				if ($idbankfordirectdebit > 0) {
 					$tmpbankfordirectdebit = new Account($this->db);
 					$tmpbankfordirectdebit->fetch($idbankfordirectdebit);
-					$ics = $tmpbankfordirectdebit->ics;	// ICS for direct debit
+					$ics = $tmpbankfordirectdebit->ics; // ICS for direct debit
 				}
 				if (empty($ics) && !empty($conf->global->PRELEVEMENT_ICS)) {
 					$ics = $conf->global->PRELEVEMENT_ICS;
@@ -313,9 +313,9 @@ 
 
 				$address = '______________________________________________';
 				if ($thirdparty->id > 0) {
-					$tmpaddresswithoutcountry = $thirdparty->getFullAddress();	// we test on address without country
+					$tmpaddresswithoutcountry = $thirdparty->getFullAddress(); // we test on address without country
 					if ($tmpaddresswithoutcountry) {
-						$address = $thirdparty->getFullAddress(1);	// full address
+						$address = $thirdparty->getFullAddress(1); // full address
 					}
 				}
 				$posY = $pdf->GetY();

htdocs/core/modules/product/doc/pdf_standard.modules.php

Spacing +6 added lines, -6 removed lines

@@ -294,20 +294,20 @@
 					$nexY = $pdf->GetY();
 				}
 				if ($object->length) {
-					$texttoshow = $langs->trans("Length") . ' x ' . $langs->trans("Width") . ' x ' . $langs->trans("Height") . ': ' . ($object->length != '' ? $object->length : '?') . ' x ' . ($object->width != '' ? $object->width : '?') . ' x ' . ($object->height != '' ? $object->height : '?');
-					$texttoshow .= ' ' . measuringUnitString(0, "size", $object->length_units);
+					$texttoshow = $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?');
+					$texttoshow .= ' '.measuringUnitString(0, "size", $object->length_units);
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
 				if ($object->surface) {
-					$texttoshow = $langs->trans("Surface") . ': ' . dol_htmlentitiesbr($object->surface);
-					$texttoshow .= ' ' . measuringUnitString(0, "surface", $object->surface_units);
+					$texttoshow = $langs->trans("Surface").': '.dol_htmlentitiesbr($object->surface);
+					$texttoshow .= ' '.measuringUnitString(0, "surface", $object->surface_units);
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
 				if ($object->volume) {
-					$texttoshow = $langs->trans("Volume") . ': ' . dol_htmlentitiesbr($object->volume);
-					$texttoshow .= ' ' . measuringUnitString(0, "volume", $object->volume_units);
+					$texttoshow = $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume);
+					$texttoshow .= ' '.measuringUnitString(0, "volume", $object->volume_units);
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}