Dolibarr / dolibarr

htdocs/compta/bank/bankentries_list.php

Spacing +25 added lines, -25 removed lines

@@ -161,12 +161,12 @@ 
 $search_array_options = $extrafields->getOptionalsFromPost('banktransaction', '', 'search_');
 
 $arrayfields = array(
-	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1,'position'=>10),
-	'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1,'position'=>20),
-	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1,'position'=>30),
-	'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1,'position'=>40),
-	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1,'position'=>50),
-	'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1,'position'=>60),
+	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1, 'position'=>10),
+	'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1, 'position'=>20),
+	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1, 'position'=>30),
+	'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1, 'position'=>40),
+	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1, 'position'=>50),
+	'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1, 'position'=>60),
 	'bu.label'=>array('label'=>$langs->trans("ThirdParty").'/'.$langs->trans("User"), 'checked'=>1, 'position'=>70),
 	'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || !empty($ref)) ? 0 : 1), 'position'=>80),
 	'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>90),
@@ -409,7 +409,7 @@ 
 
 $companystatic = new Societe($db);
 $bankaccountstatic = new Account($db);
-$userstatic= new User($db);
+$userstatic = new User($db);
 
 $banktransferstatic = new BonPrelevement($db);
 $societestatic = new Societe($db);
@@ -643,21 +643,21 @@ 
 	$sql .= " AND b.rappro = ".((int) $search_conciliated);
 }
 if ($search_fk_bordereau > 0) {
-	$sql .= " AND b.fk_bordereau = " . ((int) $search_fk_bordereau);
+	$sql .= " AND b.fk_bordereau = ".((int) $search_fk_bordereau);
 }
 if ($search_thirdparty_user) {
-	$sql.= " AND (b.rowid IN ";
-	$sql.= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
-	$sql.= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
-	$sql.= "	 JOIN ".MAIN_DB_PREFIX."user AS subUser ON (bu.type = 'user' AND bu.url_id = subUser.rowid)";
-	$sql.= "	  WHERE ". natural_search(array("subUser.firstname", "subUser.lastname"), $search_thirdparty_user, '', 1).")";
-
-	$sql.= " OR b.rowid IN ";
-	$sql.= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
-	$sql.= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
-	$sql.= "	 JOIN ".MAIN_DB_PREFIX."societe AS subSoc ON (bu.type = 'company' AND bu.url_id = subSoc.rowid)";
-	$sql.= "	  WHERE ". natural_search(array("subSoc.nom"), $search_thirdparty_user, '', 1);
-	$sql.= "))";
+	$sql .= " AND (b.rowid IN ";
+	$sql .= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
+	$sql .= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
+	$sql .= "	 JOIN ".MAIN_DB_PREFIX."user AS subUser ON (bu.type = 'user' AND bu.url_id = subUser.rowid)";
+	$sql .= "	  WHERE ".natural_search(array("subUser.firstname", "subUser.lastname"), $search_thirdparty_user, '', 1).")";
+
+	$sql .= " OR b.rowid IN ";
+	$sql .= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
+	$sql .= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
+	$sql .= "	 JOIN ".MAIN_DB_PREFIX."societe AS subSoc ON (bu.type = 'company' AND bu.url_id = subSoc.rowid)";
+	$sql .= "	  WHERE ".natural_search(array("subSoc.nom"), $search_thirdparty_user, '', 1);
+	$sql .= "))";
 }
 if ($search_description) {
 	$search_description_to_use = $search_description;
@@ -1367,10 +1367,10 @@ 
 			$backgroundcolor = "class='oddeven'";
 		} else {
 			if ($objp->amount < 0) {
-				$color = '#' . getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR1', 'fca955');
+				$color = '#'.getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR1', 'fca955');
 				$backgroundcolor = 'style="background: '.$color.';"';
 			} else {
-				$color = '#' . getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR2', '7fdb86');
+				$color = '#'.getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR2', '7fdb86');
 				$backgroundcolor = 'style="background: '.$color.';"';
 			}
 		}
@@ -1507,7 +1507,7 @@ 
 				}
 			}
 
-			print $labeltoshow;	// Already escaped
+			print $labeltoshow; // Already escaped
 
 			print '</td>';
 			if (!$i) {
@@ -1738,8 +1738,8 @@ 
 		}
 
 		// Fields from hook
-		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp);    // Note that $action and $objecttmpect may have been modified by hook
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp); // Note that $action and $objecttmpect may have been modified by hook
 		print $hookmanager->resPrint;
 
 		// Action edit/delete and select

htdocs/compta/bank/transfer.php

Spacing +8 added lines, -8 removed lines

@@ -87,7 +87,7 @@ 
 		$type[$i] = GETPOST($i.'_type', 'int');
 
 		$tabnum[$i] = 0;
-		if (!empty($label[$i]) || !($amount[$i] <= 0) || !($accountfrom[$i] < 0) || !($accountto[$i]  < 0)) {
+		if (!empty($label[$i]) || !($amount[$i] <= 0) || !($accountfrom[$i] < 0) || !($accountto[$i] < 0)) {
 			$tabnum[$i] = 1;
 			$maxtab = $i;
 		}
@@ -101,28 +101,28 @@ 
 		if ($tabnum[$n] === 1) {
 			if ($accountfrom[$n] < 0) {
 				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", '#'.$n. ' ' .$langs->transnoentities("TransferFrom")), null, 'errors');
+				setEventMessages($langs->trans("ErrorFieldRequired", '#'.$n.' '.$langs->transnoentities("TransferFrom")), null, 'errors');
 			}
 			if ($accountto[$n] < 0) {
 				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", '#'.$n. ' ' .$langs->transnoentities("TransferTo")), null, 'errors');
+				setEventMessages($langs->trans("ErrorFieldRequired", '#'.$n.' '.$langs->transnoentities("TransferTo")), null, 'errors');
 			}
 			if (!$type[$n]) {
 				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", '#'.$n. ' ' .$langs->transnoentities("Type")), null, 'errors');
+				setEventMessages($langs->trans("ErrorFieldRequired", '#'.$n.' '.$langs->transnoentities("Type")), null, 'errors');
 			}
 			if (!$dateo[$n]) {
 				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", '#'.$n. ' ' .$langs->transnoentities("Date")), null, 'errors');
+				setEventMessages($langs->trans("ErrorFieldRequired", '#'.$n.' '.$langs->transnoentities("Date")), null, 'errors');
 			}
 
 			if (!($label[$n])) {
 				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", '#'.$n. ' ' . $langs->transnoentities("Description")), null, 'errors');
+				setEventMessages($langs->trans("ErrorFieldRequired", '#'.$n.' '.$langs->transnoentities("Description")), null, 'errors');
 			}
 			if (!($amount[$n])) {
 				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", '#'.$n. ' ' .$langs->transnoentities("Amount")), null, 'errors');
+				setEventMessages($langs->trans("ErrorFieldRequired", '#'.$n.' '.$langs->transnoentities("Amount")), null, 'errors');
 			}
 
 			$tmpaccountfrom = new Account($db);
@@ -298,7 +298,7 @@ 
 print '<td class="hideobject multicurrency right">'.$langs->trans("AmountToOthercurrency").'</td>';
 print '</tr>';
 
-for ($i = 1 ; $i < $MAXLINES; $i++) {
+for ($i = 1; $i < $MAXLINES; $i++) {
 	$label = '';
 	$amount = '';
 	$amountto = '';

htdocs/compta/bank/various_payment/list.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
 $object = new PaymentVarious($db);
 $extrafields = new ExtraFields($db);
 //$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array($contextpage)); 	// Note that conf->hooks_modules contains array of activated contexes
+$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -460,7 +460,7 @@ 
 
 $arrayofmassactions = array();
 
-$moreforfilter= '';
+$moreforfilter = '';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields

htdocs/compta/prelevement/class/ligneprelevement.class.php

Spacing +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
 
 	const STATUS_DRAFT = 0;
 	const STATUS_NOT_USED = 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
 	const STATUS_REJECTED = 3;
 
 

htdocs/compta/prelevement/factures.php

Spacing +1 added lines, -1 removed lines

@@ -255,7 +255,7 @@
 	$i = 0;
 
 	if ($limit > 0 && $limit != $conf->liste_limit) {
-		$param.='&limit='.((int) $limit);
+		$param .= '&limit='.((int) $limit);
 	}
 	$param = "&id=".urlencode($id);
 

htdocs/compta/localtax/clients.php

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 
 $calc = getDolGlobalString('MAIN_INFO_LOCALTAX_CALC').$local;
 // Affiche en-tete du rapport
-$description='';
+$description = '';
 if ($calc == 0 || $calc == 1) {	// Calculate on invoice for goods and services
 	$calcmode = $calc == 0 ? $langs->trans("CalcModeLT".$local) : $langs->trans("CalcModeLT".$local."Rec");
 	$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';

htdocs/compta/localtax/quadri_detail.php

Spacing +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
 // Set period
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 $prevyear = $year_start;
-$q=0;
+$q = 0;
 $prevquarter = $q;
 if ($prevquarter > 1) {
 	$prevquarter--;

htdocs/compta/resultat/index.php

Spacing +4 added lines, -4 removed lines

@@ -50,7 +50,7 @@ 
 
 
 // Date range
-$year = GETPOST('year', 'int');		// this is used for navigation previous/next. It is the last year to show in filter
+$year = GETPOST('year', 'int'); // this is used for navigation previous/next. It is the last year to show in filter
 if (empty($year)) {
 	$year_current = dol_print_date(dol_now(), "%Y");
 	$month_current = dol_print_date(dol_now(), "%m");
@@ -618,7 +618,7 @@ 
 
 if (isModEnabled('salaries') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	if ($modecompta == 'CREANCES-DETTES') {
-		$column = 's.dateep';		// we use the date of end of period of salary
+		$column = 's.dateep'; // we use the date of end of period of salary
 
 		$sql = "SELECT s.label as nom, date_format(".$column.",'%Y-%m') as dm, sum(s.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."salary as s";
@@ -947,14 +947,14 @@ 
 
 				if ($obj->pcg_type == 'INCOME') {
 					if (!isset($encaiss[$obj->dm])) {
-						$encaiss[$obj->dm] = 0;	// To avoid warning of var not defined
+						$encaiss[$obj->dm] = 0; // To avoid warning of var not defined
 					}
 					$encaiss[$obj->dm] += $obj->credit;
 					$encaiss[$obj->dm] -= $obj->debit;
 				}
 				if ($obj->pcg_type == 'EXPENSE') {
 					if (!isset($decaiss[$obj->dm])) {
-						$decaiss[$obj->dm] = 0;	// To avoid warning of var not defined
+						$decaiss[$obj->dm] = 0; // To avoid warning of var not defined
 					}
 					$decaiss[$obj->dm] += $obj->debit;
 					$decaiss[$obj->dm] -= $obj->credit;

htdocs/compta/resultat/clientfourn.php

Spacing +4 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
 }
 
 // Date range
-$year = GETPOST('year', 'int');		// this is used for navigation previous/next. It is the last year to show in filter
+$year = GETPOST('year', 'int'); // this is used for navigation previous/next. It is the last year to show in filter
 if (empty($year)) {
 	$year_current = dol_print_date(dol_now(), "%Y");
 	$month_current = dol_print_date(dol_now(), "%m");
@@ -265,7 +265,7 @@ 
 	if ($modecompta == 'CREANCES-DETTES') {
 		print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'class="right"', $sortfield, $sortorder);
 	} else {
-		print_liste_field_titre('');  // Make 4 columns in total whatever $modecompta is
+		print_liste_field_titre(''); // Make 4 columns in total whatever $modecompta is
 	}
 	print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], 'amount_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
 }
@@ -300,7 +300,7 @@ 
 	}
 	$sql .= " GROUP BY pcg_type";
 	if ($showaccountdetail == 'no') {
-		$sql .= ", name, socid";	// group by "accounting group" (INCOME/EXPENSE), then "customer".
+		$sql .= ", name, socid"; // group by "accounting group" (INCOME/EXPENSE), then "customer".
 	}
 	$sql .= $db->order($sortfield, $sortorder);
 
@@ -939,7 +939,7 @@ 
 
 		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') {
 			if ($modecompta == 'CREANCES-DETTES') {
-				$column = 's.dateep';	// We use the date of end of period of salary
+				$column = 's.dateep'; // We use the date of end of period of salary
 
 				$sql = "SELECT u.rowid, u.firstname, u.lastname, s.fk_user as fk_user, s.label as label, date_format($column,'%Y-%m') as dm, sum(s.amount) as amount";
 				$sql .= " FROM ".MAIN_DB_PREFIX."salary as s";