Dolibarr / dolibarr

htdocs/don/payment/card.php

Spacing +1 added lines, -1 removed lines

@@ -216,7 +216,7 @@
 		if (!$disable_delete) {
 			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), '', 1);
 		} else {
-			print dolGetButtonAction($langs->trans("CantRemovePaymentWithOneInvoicePaid"), $langs->trans('Delete'), '', $_SERVER["PHP_SELF"].'?id='.$object->id.'#', '', 1, [ 'attr' => ['classOverride' => 'butActionRefused']]);
+			print dolGetButtonAction($langs->trans("CantRemovePaymentWithOneInvoicePaid"), $langs->trans('Delete'), '', $_SERVER["PHP_SELF"].'?id='.$object->id.'#', '', 1, ['attr' => ['classOverride' => 'butActionRefused']]);
 		}
 	}
 }

htdocs/accountancy/class/api_accountancy.class.php

Spacing +6 added lines, -6 removed lines

@@ -137,7 +137,7 @@ 
 		// set filter for each period available
 		$filter = array();
 		$doc_date_start = null;
-		$doc_date_end= null;
+		$doc_date_end = null;
 		$now = dol_now();
 		$now_arr = dol_getdate($now);
 		$now_month = $now_arr['mon'];
@@ -173,9 +173,9 @@ 
 			$prev_month_date_list = array();
 			$prev_month_date_list[] = dol_get_prev_month($now_month, $now_year); // get previous month for index = 0
 			for ($i = 1; $i < $nb_prev_month; $i++) {
-				$prev_month_date_list[] = dol_get_prev_month($prev_month_date_list[$i-1]['month'], $prev_month_date_list[$i-1]['year']); // get i+1 previous month for index=i
+				$prev_month_date_list[] = dol_get_prev_month($prev_month_date_list[$i - 1]['month'], $prev_month_date_list[$i - 1]['year']); // get i+1 previous month for index=i
 			}
-			$doc_date_start = dol_mktime(0, 0, 0, $prev_month_date_list[$nb_prev_month-1]['month'], 1, $prev_month_date_list[$nb_prev_month-1]['year']); // first day of n previous month for index=n-1
+			$doc_date_start = dol_mktime(0, 0, 0, $prev_month_date_list[$nb_prev_month - 1]['month'], 1, $prev_month_date_list[$nb_prev_month - 1]['year']); // first day of n previous month for index=n-1
 			$doc_date_end = dol_get_last_day($prev_month_date_list[0]['year'], $prev_month_date_list[0]['month']); // last day of previous month for index = 0
 		} elseif ($period == 'currentyear' || $period == 'lastyear') {
 			$period_year = $now_year;
@@ -242,9 +242,9 @@ 
 					foreach ($bookkeeping->lines as $movement) {
 						$now = dol_now();
 
-						$sql = " UPDATE " . MAIN_DB_PREFIX . "accounting_bookkeeping";
-						$sql .= " SET date_export = '" . $this->db->idate($now) . "'";
-						$sql .= " WHERE rowid = " . ((int) $movement->id);
+						$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
+						$sql .= " SET date_export = '".$this->db->idate($now)."'";
+						$sql .= " WHERE rowid = ".((int) $movement->id);
 
 						$result = $this->db->query($sql);
 						if (!$result) {

htdocs/accountancy/tpl/export_journal.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -72,5 +72,5 @@
 }
 
 if (empty($downloadMode)) {
-	header('Content-Disposition: attachment;filename=' . $completefilename);
+	header('Content-Disposition: attachment;filename='.$completefilename);
 }

htdocs/accountancy/admin/card.php

Spacing +14 added lines, -14 removed lines

@@ -76,9 +76,9 @@ 
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$action = 'create';
 		} else {
-			$sql = "SELECT pcg_version FROM " . MAIN_DB_PREFIX . "accounting_system WHERE rowid = ".((int) getDolGlobalInt('CHARTOFACCOUNTS'));
+			$sql = "SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid = ".((int) getDolGlobalInt('CHARTOFACCOUNTS'));
 
-			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
+			dol_syslog('accountancy/admin/card.php:: $sql='.$sql);
 			$result = $db->query($sql);
 			$obj = $db->fetch_object($result);
 
@@ -123,7 +123,7 @@ 
 			if (!$error) {
 				setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
 				$urltogo = $backtopage ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php';
-				header("Location: " . $urltogo);
+				header("Location: ".$urltogo);
 				exit;
 			}
 		}
@@ -141,7 +141,7 @@ 
 
 			$sql = "SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid=".((int) getDolGlobalInt('CHARTOFACCOUNTS'));
 
-			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
+			dol_syslog('accountancy/admin/card.php:: $sql='.$sql);
 			$result2 = $db->query($sql);
 			$obj = $db->fetch_object($result2);
 
@@ -171,8 +171,8 @@ 
 			$result = $object->update($user);
 
 			if ($result > 0) {
-				$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"] . "?id=" . $id);
-				header("Location: " . $urltogo);
+				$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
+				header("Location: ".$urltogo);
 				exit();
 			} elseif ($result == -2) {
 				setEventMessages($langs->trans("ErrorAccountNumberAlreadyExists", $object->account_number), null, 'errors');
@@ -264,14 +264,14 @@ 
 	print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
 	// autosuggest from existing account types if found
 	print '<datalist id="pcg_type_datalist">';
-	$sql = "SELECT DISTINCT pcg_type FROM " . MAIN_DB_PREFIX . "accounting_account";
-	$sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'";
-	$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')';		// Always limit to current entity. No sharing in accountancy.
+	$sql = "SELECT DISTINCT pcg_type FROM ".MAIN_DB_PREFIX."accounting_account";
+	$sql .= " WHERE fk_pcg_version = '".$db->escape($accountsystem->ref)."'";
+	$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')'; // Always limit to current entity. No sharing in accountancy.
 	$sql .= ' LIMIT 50000'; // just as a sanity check
 	$resql = $db->query($sql);
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
-			print '<option value="' . dol_escape_htmltag($obj->pcg_type) . '">';
+			print '<option value="'.dol_escape_htmltag($obj->pcg_type).'">';
 		}
 	}
 	print '</datalist>';
@@ -341,14 +341,14 @@ 
 			print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
 			// autosuggest from existing account types if found
 			print '<datalist id="pcg_type_datalist">';
-			$sql = 'SELECT DISTINCT pcg_type FROM ' . MAIN_DB_PREFIX . 'accounting_account';
-			$sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'";
-			$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')';		// Always limit to current entity. No sharing in accountancy.
+			$sql = 'SELECT DISTINCT pcg_type FROM '.MAIN_DB_PREFIX.'accounting_account';
+			$sql .= " WHERE fk_pcg_version = '".$db->escape($accountsystem->ref)."'";
+			$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')'; // Always limit to current entity. No sharing in accountancy.
 			$sql .= ' LIMIT 50000'; // just as a sanity check
 			$resql = $db->query($sql);
 			if ($resql) {
 				while ($obj = $db->fetch_object($resql)) {
-					print '<option value="' . dol_escape_htmltag($obj->pcg_type) . '">';
+					print '<option value="'.dol_escape_htmltag($obj->pcg_type).'">';
 				}
 			}
 			print '</datalist>';

htdocs/compta/tva/card.php

Spacing +5 added lines, -5 removed lines

@@ -252,7 +252,7 @@ 
 				}
 			}
 			if (empty($error)) {
-				header("Location: card.php?id=" . $object->id);
+				header("Location: card.php?id=".$object->id);
 				exit;
 			}
 		}
@@ -307,7 +307,7 @@ 
 		} else {
 			$result = $object->fetch($id);
 
-			$object->amount	= $amount;
+			$object->amount = $amount;
 
 			$result = $object->update($user);
 			if ($result <= 0) {
@@ -469,7 +469,7 @@ 
 
 	// Auto create payment
 	print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>';
-	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_payment) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n";
+	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.(empty($auto_create_payment) ? '' : 'checked="checked"').' value="1"></td></tr>'."\n";
 
 	print '<tr class="hide_if_no_auto_create_payment">';
 	print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
@@ -609,9 +609,9 @@ 
 	print '</td></tr>';
 
 	if ($action == 'edit') {
-		print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.price($object->amount).'"></td></tr>';
 	} else {
-		print '<tr><td>' . $langs->trans("Amount") . '</td><td>' . price($object->amount) . '</td></tr>';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 	}
 
 	// Mode of payment

htdocs/compta/stats/index.php

Spacing +3 added lines, -3 removed lines

@@ -52,8 +52,8 @@ 
 	$month_current = dol_print_date(dol_now(), "%m");
 	$year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1);
 }
-$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver');	// We use timezone of server so report is same from everywhere
-$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver');		// We use timezone of server so report is same from everywhere
+$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere
+$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere
 
 // We define date_start and date_end
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
@@ -255,7 +255,7 @@ 
 	$sql .= " AND b.doc_type = 'customer_invoice'";
 	$sql .= " AND aa.entity = ".$conf->entity;
 	$sql .= " AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
-	$sql .= " AND aa.pcg_type = 'INCOME'";		// TODO Be able to use a custom group
+	$sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group
 }
 $sql .= " GROUP BY dm";
 $sql .= " ORDER BY dm";

htdocs/compta/stats/supplier_turnover.php

Spacing +3 added lines, -3 removed lines

@@ -48,8 +48,8 @@ 
 	$month_current = dol_print_date(dol_now(), "%m");
 	$year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1);
 }
-$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver');	// We use timezone of server so report is same from everywhere
-$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver');		// We use timezone of server so report is same from everywhere
+$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere
+$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere
 
 // We define date_start and date_end
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
@@ -240,7 +240,7 @@ 
 	$sql .= " AND b.numero_compte = aa.account_number";
 	$sql .= " AND aa.entity = ".$conf->entity;
 	$sql .= " AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
-	$sql .= " AND aa.pcg_type = 'EXPENSE'";		// TODO Be able to use a custom group
+	$sql .= " AND aa.pcg_type = 'EXPENSE'"; // TODO Be able to use a custom group
 }
 //print $sql;
 

htdocs/compta/bank/class/paymentvarious.class.php

Spacing +2 added lines, -2 removed lines

@@ -306,7 +306,7 @@ 
 				$this->type_payment         = $obj->fk_typepayment;
 				$this->num_payment          = $obj->num_payment;
 				$this->label                = $obj->label;
-				$this->note                 = $obj->note_private;	// For backward compatibility
+				$this->note                 = $obj->note_private; // For backward compatibility
 				$this->note_private         = $obj->note_private;
 				$this->subledger_account    = $obj->subledger_account;
 				$this->accountancy_code     = $obj->accountancy_code;
@@ -486,7 +486,7 @@ 
 		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : 0);
 		$sql .= ", ".((int) $user->id);
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", NULL";	// Filled later
+		$sql .= ", NULL"; // Filled later
 		$sql .= ", ".((int) $conf->entity);
 		$sql .= ")";
 

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