Dolibarr / dolibarr

htdocs/core/actions_sendmails.inc.php

Spacing +5 added lines, -5 removed lines

@@ -309,11 +309,11 @@ 
 			$fromtype = GETPOST('fromtype', 'alpha');
 			$emailsendersignature = '';
 			if ($fromtype === 'robot') {
-				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")).' <' . getDolGlobalString('MAIN_MAIL_EMAIL_FROM').'>';
+				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")).' <'.getDolGlobalString('MAIN_MAIL_EMAIL_FROM').'>';
 			} elseif ($fromtype === 'user') {
 				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")).' <'.$user->email.'>';
 			} elseif ($fromtype === 'company') {
-				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
+				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
 			} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
 				$tmp = explode(',', $user->email_aliases);
 				$from = trim($tmp[((int) $reg[1] - 1)]);
@@ -356,7 +356,7 @@ 
 			// Autocomplete the $sendtobcc
 			// $autocopy can be MAIN_MAIL_AUTOCOPY_PROPOSAL_TO, MAIN_MAIL_AUTOCOPY_ORDER_TO, MAIN_MAIL_AUTOCOPY_INVOICE_TO, MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO...
 			if (!empty($autocopy)) {
-				$sendtobcc .= (getDolGlobalString($autocopy) ? (($sendtobcc ? ", " : "") . getDolGlobalString($autocopy)) : '');
+				$sendtobcc .= (getDolGlobalString($autocopy) ? (($sendtobcc ? ", " : "").getDolGlobalString($autocopy)) : '');
 			}
 
 			$deliveryreceipt = GETPOSTINT('deliveryreceipt') ? 1 : 0;
@@ -427,7 +427,7 @@ 
 						$object->actionmsg = $message; // Long text
 						$object->actionmsg2 = $actionmsg2; // Short text ($langs->transnoentities('MailSentByTo')...);
 						if (getDolGlobalString('MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT')) {
-							$object->actionmsg2		= $subject; // Short text
+							$object->actionmsg2 = $subject; // Short text
 						}
 
 						$object->trackid = $trackid;
@@ -449,7 +449,7 @@ 
 
 						// Call of triggers (you should have set $triggersendname to execute trigger.
 						if (!empty($triggersendname)) {
-							$result = $object->call_trigger($triggersendname, $user);  // @phan-suppress-current-line PhanPossiblyUndeclaredGlobalVariable
+							$result = $object->call_trigger($triggersendname, $user); // @phan-suppress-current-line PhanPossiblyUndeclaredGlobalVariable
 							if ($result < 0) {
 								$error++;
 							}

htdocs/accountancy/class/bookkeeping.class.php

Spacing +96 added lines, -96 removed lines

@@ -372,7 +372,7 @@ 
 				if (empty($this->piece_num)) {
 					$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
 					$sqlnum .= " FROM ".$this->db->prefix().$this->table_element;
-					$sqlnum .= " WHERE entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+					$sqlnum .= " WHERE entity = ".((int) $conf->entity); // Do not use getEntity for accounting features
 
 					$resqlnum = $this->db->query($sqlnum);
 					if ($resqlnum) {
@@ -468,7 +468,7 @@ 
 		}
 
 		// Call triggers
-		if (! $error && ! $notrigger) {
+		if (!$error && !$notrigger) {
 			$result = $this->call_trigger('BOOKKEEPING_CREATE', $user);
 			if ($result < 0) {
 				$error++;
@@ -552,7 +552,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) {
@@ -719,7 +719,7 @@ 
 		if (!$error) {
 			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element.$mode);
 			// Call triggers
-			if (! $notrigger) {
+			if (!$notrigger) {
 				$result = $this->call_trigger('BOOKKEEPING_CREATE', $user);
 				if ($result < 0) {
 					$error++;
@@ -784,7 +784,7 @@ 
 		$sql .= " t.date_validated as date_validation";
 		$sql .= ' FROM '.$this->db->prefix().$this->table_element.$mode.' as t';
 		$sql .= ' WHERE 1 = 1';
-		$sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= " AND entity = ".((int) $conf->entity); // Do not use getEntity for accounting features
 		if (null !== $ref) {
 			$sql .= " AND t.rowid = ".((int) $ref);
 		} else {
@@ -956,7 +956,7 @@ 
 			}
 		}
 		$sql .= ' FROM '.$this->db->prefix().$this->table_element.' as t';
-		$sql .= ' WHERE entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= ' WHERE entity = '.((int) $conf->entity); // Do not use getEntity for accounting features
 		if (count($sqlwhere) > 0) {
 			$sql .= " AND ".implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere);
 		}
@@ -1091,7 +1091,7 @@ 
 		$sql .= " t.date_validated as date_validation";
 		$sql .= ' FROM '.$this->db->prefix().$this->table_element.' as t';
 
-		$sql .= ' WHERE t.entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= ' WHERE t.entity = '.((int) $conf->entity); // Do not use getEntity for accounting features
 		if ($showAlreadyExportMovements == 0) {
 			$sql .= " AND t.date_export IS NULL";
 		}
@@ -1259,7 +1259,7 @@ 
 		$sql .= " SUM(t.debit) as debit,";
 		$sql .= " SUM(t.credit) as credit";
 		$sql .= ' FROM '.$this->db->prefix().$this->table_element.' as t';
-		$sql .= ' WHERE entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= ' WHERE entity = '.((int) $conf->entity); // Do not use getEntity for accounting features
 
 		// Manage filter
 		if (is_array($filter)) {
@@ -1487,7 +1487,7 @@ 
 		}
 
 		// Call triggers
-		if (! $error && ! $notrigger) {
+		if (!$error && !$notrigger) {
 			$result = $this->call_trigger('BOOKKEEPING_MODIFY', $user);
 			if ($result < 0) {
 				$error++;
@@ -1683,7 +1683,7 @@ 
 		if (!empty($journal)) {
 			$sql .= " AND code_journal = '".$this->db->escape($journal)."'";
 		}
-		$sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= " AND entity = ".((int) $conf->entity); // Do not use getEntity for accounting features
 		// Exclusion of validated entries at the time of deletion
 		$sql .= " AND date_validated IS NULL";
 		$sql .= $sql_filter;
@@ -1729,7 +1729,7 @@ 
 		$this->db->begin();
 
 		// Call triggers
-		if (! $error && ! $notrigger) {
+		if (!$error && !$notrigger) {
 			$result = $this->call_trigger('BOOKKEEPING_DELETE', $user);
 			if ($result < 0) {
 				$error++;
@@ -1741,8 +1741,8 @@ 
 			$sql = "DELETE";
 			$sql .= " FROM ".$this->db->prefix().$this->table_element.$mode;
 			$sql .= " WHERE piece_num = ".(int) $piecenum;
-			$sql .= " AND date_validated IS NULL";		// For security, exclusion of validated entries at the time of deletion
-			$sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+			$sql .= " AND date_validated IS NULL"; // For security, exclusion of validated entries at the time of deletion
+			$sql .= " AND entity = ".((int) $conf->entity); // Do not use getEntity for accounting features
 			$sql .= $sql_filter;
 
 			$resql = $this->db->query($sql);
@@ -1876,7 +1876,7 @@ 
 		}
 		$sql .= " FROM ".$this->db->prefix().$this->table_element.$mode;
 		$sql .= " WHERE piece_num = ".((int) $piecenum);
-		$sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= " AND entity = ".((int) $conf->entity); // Do not use getEntity for accounting features
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1917,7 +1917,7 @@ 
 		global $conf;
 
 		$sql = "SELECT MAX(piece_num)+1 as max FROM ".$this->db->prefix().$this->table_element.$mode;
-		$sql .= " WHERE entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= " WHERE entity = ".((int) $conf->entity); // Do not use getEntity for accounting features
 
 		dol_syslog(get_class($this)."::getNextNumMvt", LOG_DEBUG);
 
@@ -1961,7 +1961,7 @@ 
 		}
 		$sql .= " FROM ".$this->db->prefix().$this->table_element.$mode;
 		$sql .= " WHERE piece_num = ".((int) $piecenum);
-		$sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= " AND entity = ".((int) $conf->entity); // Do not use getEntity for accounting features
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -2026,7 +2026,7 @@ 
 		$sql .= " montant as amount, sens, fk_user_author, import_key, code_journal, piece_num,";
 		$sql .= " date_validated as date_validation";
 		$sql .= " FROM ".$this->db->prefix().$this->table_element;
-		$sql .= " WHERE entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= " WHERE entity = ".((int) $conf->entity); // Do not use getEntity for accounting features
 
 		dol_syslog(get_class($this)."::export_bookkeeping", LOG_DEBUG);
 
@@ -2104,7 +2104,7 @@ 
 
 			if (!$error) {
 				// Delete if there is an empty line
-				$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity)." AND numero_compte IS NULL AND debit = 0 AND credit = 0";
+				$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = '.((int) $conf->entity)." AND numero_compte IS NULL AND debit = 0 AND credit = 0";
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++;
@@ -2122,7 +2122,7 @@ 
 				$sql .= ' doc_ref, fk_doc, fk_docdet, entity, thirdparty_code, subledger_account, subledger_label,';
 				$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
 				$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, '.((int) $next_piecenum).", '".$this->db->idate($now)."'";
-				$sql .= ' FROM '.$this->db->prefix().$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND numero_compte IS NOT NULL AND entity = ' .((int) $conf->entity);
+				$sql .= ' FROM '.$this->db->prefix().$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND numero_compte IS NOT NULL AND entity = '.((int) $conf->entity);
 				$sql .= $sql_filter;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
@@ -2133,7 +2133,7 @@ 
 			}
 
 			if (!$error) {
-				$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
+				$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = '.((int) $conf->entity);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++;
@@ -2143,7 +2143,7 @@ 
 			}
 		} elseif ($direction == 1) {
 			if (!$error) {
-				$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
+				$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = '.((int) $conf->entity);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++;
@@ -2161,7 +2161,7 @@ 
 				$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
 				$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
 				$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num';
-				$sql .= ' FROM '.$this->db->prefix().$this->table_element.' WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
+				$sql .= ' FROM '.$this->db->prefix().$this->table_element.' WHERE piece_num = '.((int) $piece_num).' AND entity = '.((int) $conf->entity);
 				$sql .= $sql_filter;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
@@ -2172,7 +2172,7 @@ 
 			}
 
 			if (!$error) {
-				$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
+				$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = '.((int) $conf->entity);
 				$sql .= $sql_filter;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
@@ -2229,7 +2229,7 @@ 
 		$sql .= " AND aa.active = 1";
 		$sql .= " INNER JOIN ".$this->db->prefix()."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
 		$sql .= " AND asy.rowid = ".((int) $pcgver);
-		$sql .= " AND ab.entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= " AND ab.entity = ".((int) $conf->entity); // Do not use getEntity for accounting features
 		$sql .= " ORDER BY account_number ASC";
 
 		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
@@ -2293,7 +2293,7 @@ 
 		$sql .= " LEFT JOIN ".$this->db->prefix()."accounting_account as parent ON aa.account_parent = parent.rowid AND parent.active = 1";
 		$sql .= " LEFT JOIN ".$this->db->prefix()."accounting_account as root ON parent.account_parent = root.rowid AND root.active = 1";
 		$sql .= " WHERE aa.account_number = '".$this->db->escape($account)."'";
-		$sql .= " AND aa.entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= " AND aa.entity = ".((int) $conf->entity); // Do not use getEntity for accounting features
 
 		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2333,7 +2333,7 @@ 
 		$sql .= " AND asy.rowid = ".((int) $pcgver);
 		$sql .= " AND aa.active = 1";
 		$sql .= " LEFT JOIN ".$this->db->prefix()."c_accounting_category as cat ON aa.fk_accounting_category = cat.rowid";
-		$sql .= " WHERE aa.entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= " WHERE aa.entity = ".((int) $conf->entity); // Do not use getEntity for accounting features
 
 		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2366,7 +2366,7 @@ 
 		global $conf;
 
 		$alias = trim($alias);
-		$alias = !empty($alias) && strpos($alias, '.') === false ? $alias . "." : $alias;
+		$alias = !empty($alias) && strpos($alias, '.') === false ? $alias."." : $alias;
 
 		if (!isset(self::$can_modify_bookkeeping_sql_cached[$alias]) || $force) {
 			$result = $this->loadFiscalPeriods($force, 'active');
@@ -2379,10 +2379,10 @@ 
 				$i = 0;
 				foreach ($conf->cache['active_fiscal_period_cached'] as $fiscal_period) {
 					$sql_list[$i] = "(";
-					$sql_list[$i] .= "'".$this->db->idate($fiscal_period['date_start']) . "' <= ".$this->db->sanitize($alias)."doc_date";
+					$sql_list[$i] .= "'".$this->db->idate($fiscal_period['date_start'])."' <= ".$this->db->sanitize($alias)."doc_date";
 					if (!empty($fiscal_period['date_end'])) {
 						$sql_list[$i] .= " AND ";
-						$sql_list[$i] .= $this->db->sanitize($alias)."doc_date <= '" . $this->db->idate($fiscal_period['date_end'])."'";
+						$sql_list[$i] .= $this->db->sanitize($alias)."doc_date <= '".$this->db->idate($fiscal_period['date_end'])."'";
 					}
 					$sql_list[$i] .= ")";
 					$i++;
@@ -2471,17 +2471,17 @@ 
 			// Avoid trunc with dot in accountancy for the compatibility with another accounting software
 			$accountingLabelOperation = dol_trunc($thirdpartyname, $truncThirdpartyName, 'right', 'UTF-8', 1);
 			if (!empty($reference)) {
-				$accountingLabelOperation .= ' - '. $reference;
+				$accountingLabelOperation .= ' - '.$reference;
 			}
 			if (!empty($labelaccount)) {
-				$accountingLabelOperation .= ' - '. $labelaccount;
+				$accountingLabelOperation .= ' - '.$labelaccount;
 			}
 		} elseif (getDolGlobalString('ACCOUNTING_LABEL_OPERATION_ON_TRANSFER') == 1) {
 			$truncThirdpartyName = 32;
 			// Avoid trunc with dot in accountancy for the compatibility with another accounting software
 			$accountingLabelOperation = dol_trunc($thirdpartyname, $truncThirdpartyName, 'right', 'UTF-8', 1);
 			if (!empty($reference)) {
-				$accountingLabelOperation .= ' - '. $reference;
+				$accountingLabelOperation .= ' - '.$reference;
 			}
 		} elseif (getDolGlobalString('ACCOUNTING_LABEL_OPERATION_ON_TRANSFER') == 2) {
 			$truncThirdpartyName = 64;
@@ -2551,8 +2551,8 @@ 
 		if ($mode == 'active') {
 			if (!isset($conf->cache['active_fiscal_period_cached']) || $force) {
 				$sql = "SELECT date_start, date_end";
-				$sql .= " FROM " . $this->db->prefix() . "accounting_fiscalyear";
-				$sql .= " WHERE entity = " . ((int) $conf->entity);
+				$sql .= " FROM ".$this->db->prefix()."accounting_fiscalyear";
+				$sql .= " WHERE entity = ".((int) $conf->entity);
 				$sql .= " AND statut = 0";
 
 				$resql = $this->db->query($sql);
@@ -2574,8 +2574,8 @@ 
 		if ($mode == 'closed') {
 			if (!isset($conf->cache['closed_fiscal_period_cached']) || $force) {
 				$sql = "SELECT date_start, date_end";
-				$sql .= " FROM " . $this->db->prefix() . "accounting_fiscalyear";
-				$sql .= " WHERE entity = " . ((int) $conf->entity);
+				$sql .= " FROM ".$this->db->prefix()."accounting_fiscalyear";
+				$sql .= " WHERE entity = ".((int) $conf->entity);
 				$sql .= " AND statut = 1";
 
 				$resql = $this->db->query($sql);
@@ -2609,8 +2609,8 @@ 
 		$list = array();
 
 		$sql = "SELECT rowid, label, date_start, date_end, statut";
-		$sql .= " FROM " . $this->db->prefix() . "accounting_fiscalyear";
-		$sql .= " WHERE entity = " . ((int) $conf->entity);
+		$sql .= " FROM ".$this->db->prefix()."accounting_fiscalyear";
+		$sql .= " WHERE entity = ".((int) $conf->entity);
 		$sql .= $this->db->order('date_start', 'ASC');
 
 		$resql = $this->db->query($sql);
@@ -2649,13 +2649,13 @@ 
 
 		$sql = "SELECT YEAR(b.doc_date) as year";
 		for ($i = 1; $i <= 12; $i++) {
-			$sql .= ", SUM(".$this->db->ifsql("MONTH(b.doc_date) = ".((int) $i), "1", "0") . ") AS month".((int) $i);
+			$sql .= ", SUM(".$this->db->ifsql("MONTH(b.doc_date) = ".((int) $i), "1", "0").") AS month".((int) $i);
 		}
 		$sql .= ", COUNT(b.rowid) as total";
-		$sql .= " FROM " . $this->db->prefix() . $this->table_element . " as b";
-		$sql .= " WHERE b.doc_date >= '" . $this->db->idate($date_start) . "'";
-		$sql .= " AND b.doc_date <= '" . $this->db->idate($date_end) . "'";
-		$sql .= " AND b.entity IN (" . getEntity('bookkeeping', 0) . ")"; // We don't share object for accountancy
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as b";
+		$sql .= " WHERE b.doc_date >= '".$this->db->idate($date_start)."'";
+		$sql .= " AND b.doc_date <= '".$this->db->idate($date_end)."'";
+		$sql .= " AND b.entity IN (".getEntity('bookkeeping', 0).")"; // We don't share object for accountancy
 
 		// Get count for each month into the fiscal period
 		if (getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")) {
@@ -2663,7 +2663,7 @@ 
 			$sql .= " AND NOT EXISTS (SELECT rowid FROM ".MAIN_DB_PREFIX.'accounting_fiscalyear as af WHERE b.doc_date >= af.date_start AND b.doc_date <= af.date_end AND af.entity = '.((int) $conf->entity)." AND af.statut = 1)";
 		} else {
 			// Filter on the unitary flag/date lock on each record
-			$sql .= " AND date_validated IS NULL";	// not locked
+			$sql .= " AND date_validated IS NULL"; // not locked
 		}
 
 		$sql .= " GROUP BY YEAR(b.doc_date)";
@@ -2684,7 +2684,7 @@ 
 				'total' => (int) $obj->total,
 			);
 			for ($i = 1; $i <= 12; $i++) {
-				$year_list['count'][$i] = (int) $obj->{'month' . $i};
+				$year_list['count'][$i] = (int) $obj->{'month'.$i};
 			}
 
 			$list[] = $year_list;
@@ -2712,11 +2712,11 @@ 
 		$now = dol_now();
 
 		// Specify as export : update field date_validated on selected month/year
-		$sql = " UPDATE " . $this->db->prefix() . $this->table_element;
-		$sql .= " SET date_validated = '" . $this->db->idate($now) . "'";
-		$sql .= " WHERE entity = " . ((int) $conf->entity);
-		$sql .= " AND DATE(doc_date) >= '" . $this->db->idate($date_start) . "'";
-		$sql .= " AND DATE(doc_date) <= '" . $this->db->idate($date_end) . "'";
+		$sql = " UPDATE ".$this->db->prefix().$this->table_element;
+		$sql .= " SET date_validated = '".$this->db->idate($now)."'";
+		$sql .= " WHERE entity = ".((int) $conf->entity);
+		$sql .= " AND DATE(doc_date) >= '".$this->db->idate($date_start)."'";
+		$sql .= " AND DATE(doc_date) <= '".$this->db->idate($date_end)."'";
 		$sql .= " AND date_validated IS NULL";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -2749,27 +2749,27 @@ 
 
 			$pcg_type_filter = array();
 			foreach ($accounting_groups_used_for_income_statement as $item) {
-				$pcg_type_filter[] = "'" . $this->db->escape($item) . "'";
+				$pcg_type_filter[] = "'".$this->db->escape($item)."'";
 			}
 
 			$sql = 'SELECT';
 			$sql .= " t.numero_compte,";
 			$sql .= " aa.pcg_type,";
 			$sql .= " (SUM(t.credit) - SUM(t.debit)) as accounting_result";
-			$sql .= ' FROM ' . $this->db->prefix() . $this->table_element . ' as t';
-			$sql .= ' LEFT JOIN  ' . $this->db->prefix() . 'accounting_account as aa ON aa.account_number = t.numero_compte';
-			$sql .= ' WHERE t.entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
-			$sql .= " AND aa.entity = " . ((int) $conf->entity);
-			$sql .= ' AND aa.fk_pcg_version IN (SELECT pcg_version FROM ' . $this->db->prefix() . 'accounting_system WHERE rowid = ' . ((int) getDolGlobalInt('CHARTOFACCOUNTS')) . ')';
-			$sql .= ' AND aa.pcg_type IN (' . $this->db->sanitize(implode(',', $pcg_type_filter), 1) . ')';
-			$sql .= " AND DATE(t.doc_date) >= '" . $this->db->idate($date_start) . "'";
-			$sql .= " AND DATE(t.doc_date) <= '" . $this->db->idate($date_end) . "'";
+			$sql .= ' FROM '.$this->db->prefix().$this->table_element.' as t';
+			$sql .= ' LEFT JOIN  '.$this->db->prefix().'accounting_account as aa ON aa.account_number = t.numero_compte';
+			$sql .= ' WHERE t.entity = '.((int) $conf->entity); // Do not use getEntity for accounting features
+			$sql .= " AND aa.entity = ".((int) $conf->entity);
+			$sql .= ' AND aa.fk_pcg_version IN (SELECT pcg_version FROM '.$this->db->prefix().'accounting_system WHERE rowid = '.((int) getDolGlobalInt('CHARTOFACCOUNTS')).')';
+			$sql .= ' AND aa.pcg_type IN ('.$this->db->sanitize(implode(',', $pcg_type_filter), 1).')';
+			$sql .= " AND DATE(t.doc_date) >= '".$this->db->idate($date_start)."'";
+			$sql .= " AND DATE(t.doc_date) <= '".$this->db->idate($date_end)."'";
 			$sql .= ' GROUP BY t.numero_compte, aa.pcg_type';
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			} else {
 				while ($obj = $this->db->fetch_object($resql)) {
 					$income_statement_amount += $obj->accounting_result;
@@ -2808,7 +2808,7 @@ 
 			return -1;
 		} elseif (empty($fiscal_period->id)) {
 			$langs->loadLangs(array('errors', 'compta'));
-			$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('FiscalPeriod') . ' (' . $fiscal_period_id . ')';
+			$this->errors[] = $langs->trans('ErrorRecordNotFound').' - '.$langs->trans('FiscalPeriod').' ('.$fiscal_period_id.')';
 			return -1;
 		}
 
@@ -2827,7 +2827,7 @@ 
 			return -1;
 		} elseif (empty($new_fiscal_period->id)) {
 			$langs->loadLangs(array('errors', 'compta'));
-			$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('FiscalPeriod') . ' (' . $new_fiscal_period_id . ')';
+			$this->errors[] = $langs->trans('ErrorRecordNotFound').' - '.$langs->trans('FiscalPeriod').' ('.$new_fiscal_period_id.')';
 			return -1;
 		}
 
@@ -2847,7 +2847,7 @@ 
 			$journal_id = max(0, getDolGlobalString('ACCOUNTING_CLOSURE_DEFAULT_JOURNAL'));
 			if (empty($journal_id)) {
 				$langs->loadLangs(array('errors', 'accountancy'));
-				$this->errors[] = $langs->trans('ErrorBadParameters') . ' - ' . $langs->trans('Codejournal') . ' (' . $langs->trans('AccountingJournalType9') . ')';
+				$this->errors[] = $langs->trans('ErrorBadParameters').' - '.$langs->trans('Codejournal').' ('.$langs->trans('AccountingJournalType9').')';
 				$error++;
 			}
 
@@ -2861,7 +2861,7 @@ 
 					$error++;
 				} elseif ($result == 0) {
 					$langs->loadLangs(array('errors', 'accountancy'));
-					$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('Codejournal') . ' (' . $langs->trans('AccountingJournalType9') . ')';
+					$this->errors[] = $langs->trans('ErrorRecordNotFound').' - '.$langs->trans('Codejournal').' ('.$langs->trans('AccountingJournalType9').')';
 					$error++;
 				}
 			} else {
@@ -2875,7 +2875,7 @@ 
 				$pcg_type_filter = array();
 				$tmp = array_merge($accounting_groups_used_for_balance_sheet_account, $accounting_groups_used_for_income_statement);
 				foreach ($tmp as $item) {
-					$pcg_type_filter[] = "'" . $this->db->escape($item) . "'";
+					$pcg_type_filter[] = "'".$this->db->escape($item)."'";
 				}
 
 				$sql = 'SELECT';
@@ -2885,14 +2885,14 @@ 
 				}
 				$sql .= " aa.pcg_type,";
 				$sql .= " (SUM(t.credit) - SUM(t.debit)) as opening_balance";
-				$sql .= ' FROM ' . $this->db->prefix() . $this->table_element . ' as t';
-				$sql .= ' LEFT JOIN  ' . $this->db->prefix() . 'accounting_account as aa ON aa.account_number = t.numero_compte';
-				$sql .= ' WHERE t.entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
-				$sql .= " AND aa.entity = ". ((int) $conf->entity);
+				$sql .= ' FROM '.$this->db->prefix().$this->table_element.' as t';
+				$sql .= ' LEFT JOIN  '.$this->db->prefix().'accounting_account as aa ON aa.account_number = t.numero_compte';
+				$sql .= ' WHERE t.entity = '.((int) $conf->entity); // Do not use getEntity for accounting features
+				$sql .= " AND aa.entity = ".((int) $conf->entity);
 				$sql .= ' AND aa.fk_pcg_version IN (SELECT pcg_version FROM '.$this->db->prefix().'accounting_system WHERE rowid = '.((int) getDolGlobalInt('CHARTOFACCOUNTS')).')';
-				$sql .= ' AND aa.pcg_type IN (' . $this->db->sanitize(implode(',', $pcg_type_filter), 1) . ')';
-				$sql .= " AND DATE(t.doc_date) >= '" . $this->db->idate($fiscal_period->date_start) . "'";
-				$sql .= " AND DATE(t.doc_date) <= '" . $this->db->idate($fiscal_period->date_end) . "'";
+				$sql .= ' AND aa.pcg_type IN ('.$this->db->sanitize(implode(',', $pcg_type_filter), 1).')';
+				$sql .= " AND DATE(t.doc_date) >= '".$this->db->idate($fiscal_period->date_start)."'";
+				$sql .= " AND DATE(t.doc_date) <= '".$this->db->idate($fiscal_period->date_end)."'";
 				$sql .= ' GROUP BY t.numero_compte, aa.pcg_type';
 				if ($separate_auxiliary_account) {
 					$sql .= " , NULLIF(t.subledger_account, '')";
@@ -2902,8 +2902,8 @@ 
 
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = 'Error ' . $this->db->lasterror();
-					dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+					$this->errors[] = 'Error '.$this->db->lasterror();
+					dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
 					$error++;
 				} else {
@@ -2932,14 +2932,14 @@ 
 								$bookkeeping->subledger_account = $obj->subledger_account;
 								$sql = 'SELECT';
 								$sql .= " subledger_label";
-								$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-								$sql .= " WHERE subledger_account = '" . $this->db->escape($obj->subledger_account) . "'";
+								$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+								$sql .= " WHERE subledger_account = '".$this->db->escape($obj->subledger_account)."'";
 								$sql .= " ORDER BY doc_date DESC";
 								$sql .= " LIMIT 1";
 								$result = $this->db->query($sql);
 								if (!$result) {
-									$this->errors[] = 'Error: ' . $this->db->lasterror();
-									dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+									$this->errors[] = 'Error: '.$this->db->lasterror();
+									dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 									$error++;
 								}
 								$objtmp = $this->db->fetch_object($result);
@@ -2995,14 +2995,14 @@ 
 							$bookkeeping->subledger_account = $obj->subledger_account;
 							$sql = 'SELECT';
 							$sql .= " subledger_label";
-							$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-							$sql .= " WHERE subledger_account = '" . $this->db->escape($obj->subledger_account) . "'";
+							$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+							$sql .= " WHERE subledger_account = '".$this->db->escape($obj->subledger_account)."'";
 							$sql .= " ORDER BY doc_date DESC";
 							$sql .= " LIMIT 1";
 							$result = $this->db->query($sql);
 							if (!$result) {
-								$this->errors[] = 'Error: ' . $this->db->lasterror();
-								dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+								$this->errors[] = 'Error: '.$this->db->lasterror();
+								dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 								$error++;
 							}
 							$objtmp = $this->db->fetch_object($result);
@@ -3074,7 +3074,7 @@ 
 			return -1;
 		} elseif (empty($fiscal_period->id)) {
 			$langs->loadLangs(array('errors', 'compta'));
-			$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('FiscalPeriod') . ' (' . $fiscal_period_id . ')';
+			$this->errors[] = $langs->trans('ErrorRecordNotFound').' - '.$langs->trans('FiscalPeriod').' ('.$fiscal_period_id.')';
 			return -1;
 		}
 
@@ -3093,7 +3093,7 @@ 
 			return -1;
 		} elseif (empty($new_fiscal_period->id)) {
 			$langs->loadLangs(array('errors', 'compta'));
-			$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('FiscalPeriod') . ' (' . $new_fiscal_period_id . ')';
+			$this->errors[] = $langs->trans('ErrorRecordNotFound').' - '.$langs->trans('FiscalPeriod').' ('.$new_fiscal_period_id.')';
 			return -1;
 		}
 
@@ -3113,7 +3113,7 @@ 
 			return -1;
 		} elseif ($result == 0) {
 			$langs->loadLangs(array('errors', 'accountancy'));
-			$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('InventoryJournal');
+			$this->errors[] = $langs->trans('ErrorRecordNotFound').' - '.$langs->trans('InventoryJournal');
 			return -1;
 		}
 
@@ -3121,18 +3121,18 @@ 
 		$this->db->begin();
 
 		$sql = 'SELECT t.rowid';
-		$sql .= ' FROM ' . $this->db->prefix() . $this->table_element . ' as t';
-		$sql .= ' WHERE t.entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
-		$sql .= " AND code_journal = '" . $this->db->escape($inventory_journal->code) . "'";
-		$sql .= " AND DATE(t.doc_date) >= '" . $this->db->idate($date_start) . "'";
-		$sql .= " AND DATE(t.doc_date) <= '" . $this->db->idate($date_end) . "'";
-		$sql .= " AND DATE(t.doc_date) >= '" . $this->db->idate($fiscal_period->date_start) . "'";
-		$sql .= " AND DATE(t.doc_date) <= '" . $this->db->idate($fiscal_period->date_end) . "'";
+		$sql .= ' FROM '.$this->db->prefix().$this->table_element.' as t';
+		$sql .= ' WHERE t.entity = '.((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= " AND code_journal = '".$this->db->escape($inventory_journal->code)."'";
+		$sql .= " AND DATE(t.doc_date) >= '".$this->db->idate($date_start)."'";
+		$sql .= " AND DATE(t.doc_date) <= '".$this->db->idate($date_end)."'";
+		$sql .= " AND DATE(t.doc_date) >= '".$this->db->idate($fiscal_period->date_start)."'";
+		$sql .= " AND DATE(t.doc_date) <= '".$this->db->idate($fiscal_period->date_end)."'";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
 			$error++;
 		} else {
@@ -3147,7 +3147,7 @@ 
 					break;
 				} elseif ($result == 0) {
 					$langs->loadLangs(array('errors', 'accountancy'));
-					$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('LineId') . ': ' . $obj->rowid;
+					$this->errors[] = $langs->trans('ErrorRecordNotFound').' - '.$langs->trans('LineId').': '.$obj->rowid;
 					$error++;
 					break;
 				}

htdocs/fourn/class/fournisseur.facture-rec.class.php

Spacing +164 added lines, -164 removed lines

@@ -346,7 +346,7 @@ 
 		$now = dol_now();
 
 		// Clean parameters
-		$this->titre = empty($this->titre) ? '' : $this->titre;	// deprecated
+		$this->titre = empty($this->titre) ? '' : $this->titre; // deprecated
 		$this->title = empty($this->title) ? '' : $this->title;
 		$keyforref = $this->table_ref_field;
 		$this->ref = $this->$keyforref;
@@ -410,32 +410,32 @@ 
 			$sql .= ", '".$this->db->idate($now)."'";
 			$sql .= ", ".((int) $this->suspended);
 			$sql .= ", '".$this->db->escape($this->libelle)."'";
-			$sql .= ", " .(!empty($facfourn_src->total_ttc) ? (float) $facfourn_src->total_ttc : '0');                              // amount
-			$sql .= ", " .((int) $user->id);
-			$sql .= ", " .(!empty($this->fk_project) ? ((int) $this->fk_project) : 'NULL');
-			$sql .= ", " .(!empty($facfourn_src->fk_account) ? ((int) $facfourn_src->fk_account) : 'NULL');
-			$sql .= ", " .($this->cond_reglement_id > 0 ? (int) $this->cond_reglement_id : 'NULL');
-			$sql .= ", " .($this->mode_reglement_id > 0 ? (int) $this->mode_reglement_id : 'NULL');
-			$sql .= ", ".($facfourn_src->date_echeance > 0 ? "'".$this->db->idate($facfourn_src->date_echeance)."'" : 'NULL');      // date_lim_reglement
-			$sql .= ", " .(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : 'NULL');
-			$sql .= ", " .(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : 'NULL');
-			$sql .= ", " .(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : 'NULL');
-			$sql .= ", " . (int) $facfourn_src->fk_multicurrency;
+			$sql .= ", ".(!empty($facfourn_src->total_ttc) ? (float) $facfourn_src->total_ttc : '0'); // amount
+			$sql .= ", ".((int) $user->id);
+			$sql .= ", ".(!empty($this->fk_project) ? ((int) $this->fk_project) : 'NULL');
+			$sql .= ", ".(!empty($facfourn_src->fk_account) ? ((int) $facfourn_src->fk_account) : 'NULL');
+			$sql .= ", ".($this->cond_reglement_id > 0 ? (int) $this->cond_reglement_id : 'NULL');
+			$sql .= ", ".($this->mode_reglement_id > 0 ? (int) $this->mode_reglement_id : 'NULL');
+			$sql .= ", ".($facfourn_src->date_echeance > 0 ? "'".$this->db->idate($facfourn_src->date_echeance)."'" : 'NULL'); // date_lim_reglement
+			$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : 'NULL');
+			$sql .= ", ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : 'NULL');
+			$sql .= ", ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : 'NULL');
+			$sql .= ", ".(int) $facfourn_src->fk_multicurrency;
 			$sql .= ", '".$this->db->escape($facfourn_src->multicurrency_code)."'";
-			$sql .= ", " . (float) $facfourn_src->multicurrency_tx;
-			$sql .= ", " . (int) $this->usenewprice;
-			$sql .= ", " . (int) $this->frequency;
+			$sql .= ", ".(float) $facfourn_src->multicurrency_tx;
+			$sql .= ", ".(int) $this->usenewprice;
+			$sql .= ", ".(int) $this->frequency;
 			$sql .= ", '".$this->db->escape($this->unit_frequency)."'";
-			$sql .= ", " .(!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'NULL');
-			$sql .= ", " .(!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'NULL');
-			$sql .= ", " . (int) $this->nb_gen_done;
-			$sql .= ", " . (int) $this->nb_gen_max;
-			$sql .= ", " . (int) $this->auto_validate;
-			$sql .= ", " . (int) $this->generate_pdf;
+			$sql .= ", ".(!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'NULL');
+			$sql .= ", ".(!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'NULL');
+			$sql .= ", ".(int) $this->nb_gen_done;
+			$sql .= ", ".(int) $this->nb_gen_max;
+			$sql .= ", ".(int) $this->auto_validate;
+			$sql .= ", ".(int) $this->generate_pdf;
 			$sql .= ')';
 
 			if ($this->db->query($sql)) {
-				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX. 'facture_fourn_rec');
+				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_rec');
 
 				// Fields used into addline later
 				$this->fk_multicurrency = $facfourn_src->fk_multicurrency;
@@ -574,47 +574,47 @@ 
 		$error = 0;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_rec SET";
-		$sql .= " titre = '" . (!empty($this->title) ? $this->db->escape($this->title) : "")."'," ;
+		$sql .= " titre = '".(!empty($this->title) ? $this->db->escape($this->title) : "")."',";
 		$sql .= " subtype=".(isset($this->subtype) ? $this->db->escape($this->subtype) : "null").",";
-		$sql .= " ref_supplier = '". (!empty($this->ref_supplier) ? $this->db->escape($this->ref_supplier) : "")."',";
-		$sql .= " entity = ". (!empty($this->entity) ? ((int) $this->entity) : 1) . ',';
+		$sql .= " ref_supplier = '".(!empty($this->ref_supplier) ? $this->db->escape($this->ref_supplier) : "")."',";
+		$sql .= " entity = ".(!empty($this->entity) ? ((int) $this->entity) : 1).',';
 		if (!empty($this->socid) && $this->socid > 0) {
-			$sql .= " fk_soc = ". ((int) $this->socid). ',';
+			$sql .= " fk_soc = ".((int) $this->socid).',';
 		} elseif (!empty($this->fk_soc) && $this->fk_soc > 0) {	// For backward compatibility
-			$sql .= " fk_soc = ". ((int) $this->fk_soc). ',';
+			$sql .= " fk_soc = ".((int) $this->fk_soc).',';
 		}
-		$sql .= " suspended = ". (!empty($this->suspended) ? ((int) $this->suspended) : 0) . ',';
-		$sql .= " libelle = ". (!empty($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : 'NULL') . ",";
-		$sql .= " vat_src_code = ". (!empty($this->vat_src_code) ? "'".$this->db->escape($this->vat_src_code)."'" : 'NULL') . ',';
-		$sql .= " localtax1 = ". (!empty($this->localtax1) ? ((float) $this->localtax1) : 0.00) . ',';
-		$sql .= " localtax2 = ". (!empty($this->localtax2) ? ((float) $this->localtax2) : 0.00) . ',';
-		$sql .= " total_ht = ". (!empty($this->total_ht) ? ((float) $this->total_ht) : 0.00) . ',';
-		$sql .= " total_tva = ". (!empty($this->total_tva) ? ((float) $this->total_tva) : 0.00) . ',';
-		$sql .= " total_ttc = ". (!empty($this->total_ttc) ? ((float) $this->total_ttc) : 0.00) . ',';
-		$sql .= " fk_user_modif = ". ((int) $user->id) . ',';
-		$sql .= " fk_projet = ". (!empty($this->fk_project) ? ((int) $this->fk_project) : 'NULL') . ',';
-		$sql .= " fk_account = ". (!empty($this->fk_account) ? ((int) $this->fk_account) : 'NULL') . ',';
-		$sql .= " fk_mode_reglement = ". (!empty($this->mode_reglement_id) ? ((int) $this->mode_reglement_id) : 'NULL') . ',';
-		$sql .= " fk_cond_reglement = ". (!empty($this->cond_reglement_id) ? ((int) $this->cond_reglement_id) : 'NULL') . ',';
-		$sql .= " date_lim_reglement = ". (!empty($this->date_lim_reglement) ? "'".$this->db->idate($this->date_lim_reglement)."'" : 'NULL') . ',';
-		$sql .= " note_private = '". (!empty($this->note_private) ? $this->db->escape($this->note_private) : '') . "',";
-		$sql .= " note_public = '". (!empty($this->note_public) ? $this->db->escape($this->note_public) : '') . "',";
-		$sql .= " modelpdf = ". (!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : 'NULL') . ",";
-		$sql .= " fk_multicurrency = ". (!empty($this->fk_multicurrency) ? ((int) $this->fk_multicurrency) : 'NULL') . ',';
-		$sql .= " multicurrency_code = ". (!empty($this->multicurrency_code) ? "'".$this->db->escape($this->multicurrency_code)."'" : 'NULL') . ",";
-		$sql .= " multicurrency_tx = ". (!empty($this->multicurrency_tx) ? ((float) $this->multicurrency_tx) : 1) . ',';
-		$sql .= " multicurrency_total_ht = ". (!empty($this->multicurrency_total_ht) ? ((float) $this->multicurrency_total_ht) : 0.00) . ',';
-		$sql .= " multicurrency_total_tva = ". (!empty($this->multicurrency_total_tva) ? ((float) $this->multicurrency_total_tva) : 0.00) . ',';
-		$sql .= " multicurrency_total_ttc = ". (!empty($this->multicurrency_total_ttc) ? ((float) $this->multicurrency_total_ttc) : 0.00) . ',';
-		$sql .= " usenewprice = ". (!empty($this->usenewprice) ? ((int) $this->usenewprice) : 0) . ',';
-		$sql .= " frequency = ". (!empty($this->frequency) ? ((int) $this->frequency) : 0). ',';
-		$sql .= " unit_frequency = '". (!empty($this->unit_frequency) ? $this->db->escape($this->unit_frequency) : ''). "',";
-		$sql .= " date_when = ". (!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'NULL') . ',';
-		$sql .= " date_last_gen = ". (!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'NULL') . ',';
-		$sql .= " nb_gen_done = ". (!empty($this->nb_gen_done) ? ((int) $this->nb_gen_done) : 0) . ',';
-		$sql .= " nb_gen_max = ". (!empty($this->nb_gen_max) ? ((int) $this->nb_gen_max) : 0) . ',';
-		$sql .= " auto_validate = ". (!empty($this->auto_validate) ? ((int) $this->auto_validate) : 0);
-		$sql .= " WHERE rowid = ". (int) $this->id;
+		$sql .= " suspended = ".(!empty($this->suspended) ? ((int) $this->suspended) : 0).',';
+		$sql .= " libelle = ".(!empty($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : 'NULL').",";
+		$sql .= " vat_src_code = ".(!empty($this->vat_src_code) ? "'".$this->db->escape($this->vat_src_code)."'" : 'NULL').',';
+		$sql .= " localtax1 = ".(!empty($this->localtax1) ? ((float) $this->localtax1) : 0.00).',';
+		$sql .= " localtax2 = ".(!empty($this->localtax2) ? ((float) $this->localtax2) : 0.00).',';
+		$sql .= " total_ht = ".(!empty($this->total_ht) ? ((float) $this->total_ht) : 0.00).',';
+		$sql .= " total_tva = ".(!empty($this->total_tva) ? ((float) $this->total_tva) : 0.00).',';
+		$sql .= " total_ttc = ".(!empty($this->total_ttc) ? ((float) $this->total_ttc) : 0.00).',';
+		$sql .= " fk_user_modif = ".((int) $user->id).',';
+		$sql .= " fk_projet = ".(!empty($this->fk_project) ? ((int) $this->fk_project) : 'NULL').',';
+		$sql .= " fk_account = ".(!empty($this->fk_account) ? ((int) $this->fk_account) : 'NULL').',';
+		$sql .= " fk_mode_reglement = ".(!empty($this->mode_reglement_id) ? ((int) $this->mode_reglement_id) : 'NULL').',';
+		$sql .= " fk_cond_reglement = ".(!empty($this->cond_reglement_id) ? ((int) $this->cond_reglement_id) : 'NULL').',';
+		$sql .= " date_lim_reglement = ".(!empty($this->date_lim_reglement) ? "'".$this->db->idate($this->date_lim_reglement)."'" : 'NULL').',';
+		$sql .= " note_private = '".(!empty($this->note_private) ? $this->db->escape($this->note_private) : '')."',";
+		$sql .= " note_public = '".(!empty($this->note_public) ? $this->db->escape($this->note_public) : '')."',";
+		$sql .= " modelpdf = ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : 'NULL').",";
+		$sql .= " fk_multicurrency = ".(!empty($this->fk_multicurrency) ? ((int) $this->fk_multicurrency) : 'NULL').',';
+		$sql .= " multicurrency_code = ".(!empty($this->multicurrency_code) ? "'".$this->db->escape($this->multicurrency_code)."'" : 'NULL').",";
+		$sql .= " multicurrency_tx = ".(!empty($this->multicurrency_tx) ? ((float) $this->multicurrency_tx) : 1).',';
+		$sql .= " multicurrency_total_ht = ".(!empty($this->multicurrency_total_ht) ? ((float) $this->multicurrency_total_ht) : 0.00).',';
+		$sql .= " multicurrency_total_tva = ".(!empty($this->multicurrency_total_tva) ? ((float) $this->multicurrency_total_tva) : 0.00).',';
+		$sql .= " multicurrency_total_ttc = ".(!empty($this->multicurrency_total_ttc) ? ((float) $this->multicurrency_total_ttc) : 0.00).',';
+		$sql .= " usenewprice = ".(!empty($this->usenewprice) ? ((int) $this->usenewprice) : 0).',';
+		$sql .= " frequency = ".(!empty($this->frequency) ? ((int) $this->frequency) : 0).',';
+		$sql .= " unit_frequency = '".(!empty($this->unit_frequency) ? $this->db->escape($this->unit_frequency) : '')."',";
+		$sql .= " date_when = ".(!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'NULL').',';
+		$sql .= " date_last_gen = ".(!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'NULL').',';
+		$sql .= " nb_gen_done = ".(!empty($this->nb_gen_done) ? ((int) $this->nb_gen_done) : 0).',';
+		$sql .= " nb_gen_max = ".(!empty($this->nb_gen_max) ? ((int) $this->nb_gen_max) : 0).',';
+		$sql .= " auto_validate = ".(!empty($this->auto_validate) ? ((int) $this->auto_validate) : 0);
+		$sql .= " WHERE rowid = ".(int) $this->id;
 
 		$this->db->begin();
 
@@ -675,7 +675,7 @@ 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
 		$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')';
 		if ($rowid) {
-			$sql .= ' AND f.rowid='. (int) $rowid;
+			$sql .= ' AND f.rowid='.(int) $rowid;
 		} elseif ($ref) {
 			$sql .= " AND f.titre='".$this->db->escape($ref)."'";
 		} else {
@@ -692,7 +692,7 @@ 
 				$this->id                       = $obj->rowid;
 				$this->titre                    = $obj->title;
 				$this->title                    = $obj->title;
-				$this->subtype				          = $obj->subtype;
+				$this->subtype = $obj->subtype;
 				$this->ref                      = $obj->title;
 				$this->ref_supplier             = $obj->ref_supplier;
 				$this->entity                   = $obj->entity;
@@ -809,7 +809,7 @@ 
 		$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det_rec as l';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-		$sql .= ' WHERE l.fk_facture_fourn = '. (int) $this->id;
+		$sql .= ' WHERE l.fk_facture_fourn = '.(int) $this->id;
 		$sql .= ' ORDER BY l.rang';
 
 		dol_syslog('FactureFournisseurRec::fetch_lines', LOG_DEBUG);
@@ -850,14 +850,14 @@ 
 				$line->product_type             = $objp->product_type;
 				$line->date_start               = $objp->date_start;
 				$line->date_end                 = $objp->date_end;
-				$line->info_bits                = $objp->info_bits	;
+				$line->info_bits                = $objp->info_bits;
 				$line->special_code             = $objp->special_code;
 				$line->rang                     = $objp->rang;
 				$line->fk_unit                  = $objp->fk_unit;
 				$line->import_key               = $objp->import_key;
 				$line->fk_user_author           = $objp->fk_user_author;
 				$line->fk_user_modif            = $objp->fk_user_modif;
-				$this->extraparams 				= !empty($objp->extraparams) ? (array) json_decode($objp->extraparams, true) : array();
+				$this->extraparams = !empty($objp->extraparams) ? (array) json_decode($objp->extraparams, true) : array();
 				$line->fk_multicurrency         = $objp->fk_multicurrency;
 				$line->multicurrency_code       = $objp->multicurrency_code;
 				$line->multicurrency_subprice   = $objp->multicurrency_subprice;
@@ -901,11 +901,11 @@ 
 		$main = MAIN_DB_PREFIX.'facture_fourn_det_rec';
 		$ef = $main."_extrafields";
 
-		$sqlef = "DELETE FROM ".$ef." WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_facture_fourn = ". (int) $rowid .")";
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_det_rec WHERE fk_facture_fourn = ". (int) $rowid;
+		$sqlef = "DELETE FROM ".$ef." WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_facture_fourn = ".(int) $rowid.")";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_det_rec WHERE fk_facture_fourn = ".(int) $rowid;
 
 		if ($this->db->query($sqlef) && $this->db->query($sql)) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_rec WHERE rowid = ". (int) $rowid;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_rec WHERE rowid = ".(int) $rowid;
 			dol_syslog($sql);
 			if ($this->db->query($sql)) {
 				// Delete linked object
@@ -934,7 +934,7 @@ 
 			}
 			// End call triggers
 		}
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -1046,7 +1046,7 @@ 
 				}
 			}
 
-			$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . 'facture_fourn_det_rec (';
+			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det_rec (';
 			$sql .= 'fk_facture_fourn';
 			$sql .= ', fk_product';
 			$sql .= ', ref';
@@ -1078,46 +1078,46 @@ 
 			$sql .= ', fk_user_author';
 			$sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
 			$sql .= ') VALUES (';
-			$sql .= ' ' . (int) $facid;   // source supplier invoice id
-			$sql .= ', ' . (!empty($fk_product) ? "'" . $this->db->escape($fk_product) . "'" : 'null');
-			$sql .= ', ' . (!empty($ref) ? "'" . $this->db->escape($ref) . "'" : 'null');
-			$sql .= ', ' . (!empty($label) ? "'" . $this->db->escape($label) . "'" : 'null');
-			$sql .= ", '" . $this->db->escape($desc) . "'";
-			$sql .= ', ' . price2num($pu_ht);
-			$sql .= ', ' . price2num($pu_ttc);
-			$sql .= ', ' . price2num($qty);
-			$sql .= ', ' . price2num($remise_percent);
+			$sql .= ' '.(int) $facid; // source supplier invoice id
+			$sql .= ', '.(!empty($fk_product) ? "'".$this->db->escape($fk_product)."'" : 'null');
+			$sql .= ', '.(!empty($ref) ? "'".$this->db->escape($ref)."'" : 'null');
+			$sql .= ', '.(!empty($label) ? "'".$this->db->escape($label)."'" : 'null');
+			$sql .= ", '".$this->db->escape($desc)."'";
+			$sql .= ', '.price2num($pu_ht);
+			$sql .= ', '.price2num($pu_ttc);
+			$sql .= ', '.price2num($qty);
+			$sql .= ', '.price2num($remise_percent);
 			$sql .= ', null';
-			$sql .= ", '" . $this->db->escape($vat_src_code) . "'";
-			$sql .= ', ' . price2num($txtva);
-			$sql .= ', ' . price2num($txlocaltax1);
-			$sql .= ", '" . $this->db->escape(isset($localtaxes_type[0]) ? $localtaxes_type[0] : '') . "'";
-			$sql .= ', ' . price2num($txlocaltax2);
-			$sql .= ", '" . $this->db->escape(isset($localtaxes_type[2]) ? $localtaxes_type[2] : '') . "'";
-			$sql .= ', ' . price2num($total_ht);
-			$sql .= ', ' . price2num($total_tva);
-			$sql .= ', ' . price2num($total_localtax1);
-			$sql .= ', ' . price2num($total_localtax2);
-			$sql .= ', ' . price2num($total_ttc);
-			$sql .= ', ' . (int) $product_type;
-			$sql .= ', ' . ($date_start > 0 ? (int) $date_start : 'NULL');
-			$sql .= ', ' . ($date_end > 0 ? (int) $date_end : 'NULL');
-			$sql .= ', ' . (int) $info_bits;
-			$sql .= ', ' . (int) $special_code;
-			$sql .= ', ' . (int) $rang;
-			$sql .= ', ' . ($fk_unit ? (int) $fk_unit : 'NULL');
-			$sql .= ', ' . (int) $user->id;
-			$sql .= ', ' . (int) $this->fk_multicurrency;
-			$sql .= ", '" . $this->db->escape($this->multicurrency_code) . "'";
-			$sql .= ', ' . price2num($pu_ht_devise, 'CU');
-			$sql .= ', ' . price2num($multicurrency_total_ht, 'CT');
-			$sql .= ', ' . price2num($multicurrency_total_tva, 'CT');
-			$sql .= ', ' . price2num($multicurrency_total_ttc, 'CT');
+			$sql .= ", '".$this->db->escape($vat_src_code)."'";
+			$sql .= ', '.price2num($txtva);
+			$sql .= ', '.price2num($txlocaltax1);
+			$sql .= ", '".$this->db->escape(isset($localtaxes_type[0]) ? $localtaxes_type[0] : '')."'";
+			$sql .= ', '.price2num($txlocaltax2);
+			$sql .= ", '".$this->db->escape(isset($localtaxes_type[2]) ? $localtaxes_type[2] : '')."'";
+			$sql .= ', '.price2num($total_ht);
+			$sql .= ', '.price2num($total_tva);
+			$sql .= ', '.price2num($total_localtax1);
+			$sql .= ', '.price2num($total_localtax2);
+			$sql .= ', '.price2num($total_ttc);
+			$sql .= ', '.(int) $product_type;
+			$sql .= ', '.($date_start > 0 ? (int) $date_start : 'NULL');
+			$sql .= ', '.($date_end > 0 ? (int) $date_end : 'NULL');
+			$sql .= ', '.(int) $info_bits;
+			$sql .= ', '.(int) $special_code;
+			$sql .= ', '.(int) $rang;
+			$sql .= ', '.($fk_unit ? (int) $fk_unit : 'NULL');
+			$sql .= ', '.(int) $user->id;
+			$sql .= ', '.(int) $this->fk_multicurrency;
+			$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+			$sql .= ', '.price2num($pu_ht_devise, 'CU');
+			$sql .= ', '.price2num($multicurrency_total_ht, 'CT');
+			$sql .= ', '.price2num($multicurrency_total_tva, 'CT');
+			$sql .= ', '.price2num($multicurrency_total_ttc, 'CT');
 			$sql .= ')';
 
-			dol_syslog(get_class($this). '::addline', LOG_DEBUG);
+			dol_syslog(get_class($this).'::addline', LOG_DEBUG);
 			if ($this->db->query($sql)) {
-				$lineId = $this->db->last_insert_id(MAIN_DB_PREFIX. 'facture_fourn_det_rec');
+				$lineId = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det_rec');
 				$this->update_price();
 				$this->id = $facid;
 				$this->db->commit();
@@ -1168,7 +1168,7 @@ 
 
 		$facid = $this->id;
 
-		dol_syslog(get_class($this). '::updateline facid=' .$facid." rowid=$rowid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, price_base_type=$price_base_type, pu_ttc=$pu_ttc, type=$type, fk_unit=$fk_unit, pu_ht_devise=$pu_ht_devise", LOG_DEBUG);
+		dol_syslog(get_class($this).'::updateline facid='.$facid." rowid=$rowid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, price_base_type=$price_base_type, pu_ttc=$pu_ttc, type=$type, fk_unit=$fk_unit, pu_ht_devise=$pu_ht_devise", LOG_DEBUG);
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		// Check parameters
@@ -1238,41 +1238,41 @@ 
 				$product_type = $product->type;
 			}
 
-			$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facture_fourn_det_rec SET';
-			$sql .= ' fk_facture_fourn = ' . ((int) $facid);
-			$sql .= ', fk_product = ' . ($fk_product > 0 ? ((int) $fk_product) : 'null');
-			$sql .= ", ref = '" . $this->db->escape($ref) . "'";
-			$sql .= ", label = '" . $this->db->escape($label) . "'";
-			$sql .= ", description = '" . $this->db->escape($desc) . "'";
-			$sql .= ', pu_ht = ' . price2num($pu_ht);
-			$sql .= ', qty = ' . price2num($qty);
-			$sql .= ", remise_percent = '" . price2num($remise_percent) . "'";
-			$sql .= ", vat_src_code = '" . $this->db->escape($vat_src_code) . "'";
-			$sql .= ', tva_tx = ' . price2num($txtva);
-			$sql .= ', localtax1_tx = ' . (float) $txlocaltax1;
-			$sql .= ", localtax1_type = '" . $this->db->escape($localtaxes_type[0]) . "'";
-			$sql .= ', localtax2_tx = ' . (float) $txlocaltax2;
-			$sql .= ", localtax2_type = '" . $this->db->escape($localtaxes_type[2]) . "'";
-			$sql .= ", total_ht = '" . price2num($total_ht) . "'";
-			$sql .= ", total_tva = '" . price2num($total_tva) . "'";
-			$sql .= ", total_localtax1 = '" . price2num($total_localtax1) . "'";
-			$sql .= ", total_localtax2 = '" . price2num($total_localtax2) . "'";
-			$sql .= ", total_ttc = '" . price2num($total_ttc) . "'";
-			$sql .= ', product_type = ' . (int) $product_type;
-			$sql .= ', date_start = ' . (empty($date_start) ? 'NULL' : (int) $date_start);
-			$sql .= ', date_end = ' . (empty($date_end) ? 'NULL' : (int) $date_end);
-			$sql .= ', info_bits = ' . (int) $info_bits;
-			$sql .= ', special_code = ' . (int) $special_code;
-			$sql .= ', rang = ' . (int) $rang;
-			$sql .= ', fk_unit = ' . ($fk_unit ? "'" . $this->db->escape($fk_unit) . "'" : 'null');
-			$sql .= ', fk_user_modif = ' . (int) $user;
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn_det_rec SET';
+			$sql .= ' fk_facture_fourn = '.((int) $facid);
+			$sql .= ', fk_product = '.($fk_product > 0 ? ((int) $fk_product) : 'null');
+			$sql .= ", ref = '".$this->db->escape($ref)."'";
+			$sql .= ", label = '".$this->db->escape($label)."'";
+			$sql .= ", description = '".$this->db->escape($desc)."'";
+			$sql .= ', pu_ht = '.price2num($pu_ht);
+			$sql .= ', qty = '.price2num($qty);
+			$sql .= ", remise_percent = '".price2num($remise_percent)."'";
+			$sql .= ", vat_src_code = '".$this->db->escape($vat_src_code)."'";
+			$sql .= ', tva_tx = '.price2num($txtva);
+			$sql .= ', localtax1_tx = '.(float) $txlocaltax1;
+			$sql .= ", localtax1_type = '".$this->db->escape($localtaxes_type[0])."'";
+			$sql .= ', localtax2_tx = '.(float) $txlocaltax2;
+			$sql .= ", localtax2_type = '".$this->db->escape($localtaxes_type[2])."'";
+			$sql .= ", total_ht = '".price2num($total_ht)."'";
+			$sql .= ", total_tva = '".price2num($total_tva)."'";
+			$sql .= ", total_localtax1 = '".price2num($total_localtax1)."'";
+			$sql .= ", total_localtax2 = '".price2num($total_localtax2)."'";
+			$sql .= ", total_ttc = '".price2num($total_ttc)."'";
+			$sql .= ', product_type = '.(int) $product_type;
+			$sql .= ', date_start = '.(empty($date_start) ? 'NULL' : (int) $date_start);
+			$sql .= ', date_end = '.(empty($date_end) ? 'NULL' : (int) $date_end);
+			$sql .= ', info_bits = '.(int) $info_bits;
+			$sql .= ', special_code = '.(int) $special_code;
+			$sql .= ', rang = '.(int) $rang;
+			$sql .= ', fk_unit = '.($fk_unit ? "'".$this->db->escape($fk_unit)."'" : 'null');
+			$sql .= ', fk_user_modif = '.(int) $user;
 			$sql .= ', multicurrency_subprice = '.price2num($pu_ht_devise);
 			$sql .= ', multicurrency_total_ht = '.price2num($multicurrency_total_ht);
 			$sql .= ', multicurrency_total_tva = '.price2num($multicurrency_total_tva);
 			$sql .= ', multicurrency_total_ttc = '.price2num($multicurrency_total_ttc);
-			$sql .= ' WHERE rowid = ' . (int) $rowid;
+			$sql .= ' WHERE rowid = '.(int) $rowid;
 
-			dol_syslog(get_class($this). '::updateline', LOG_DEBUG);
+			dol_syslog(get_class($this).'::updateline', LOG_DEBUG);
 			if ($this->db->query($sql)) {
 				$this->id = $facid;
 				$this->update_price();
@@ -1362,16 +1362,16 @@ 
 		$tmparray = dol_getdate($now);
 		$today = dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year']); // Today is last second of current day
 
-		dol_syslog('createRecurringInvoices restrictioninvoiceid=' .$restrictioninvoiceid. ' forcevalidation=' .$forcevalidation);
+		dol_syslog('createRecurringInvoices restrictioninvoiceid='.$restrictioninvoiceid.' forcevalidation='.$forcevalidation);
 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_fourn_rec';
 		$sql .= ' WHERE frequency > 0'; // A recurring supplier invoice is an invoice with a frequency
 		$sql .= " AND (date_when IS NULL OR date_when <= '".$this->db->idate($today)."')";
 		$sql .= ' AND (nb_gen_done < nb_gen_max OR nb_gen_max = 0)';
 		$sql .= ' AND suspended = 0';
-		$sql .= ' AND entity = '. (int) $conf->entity; // MUST STAY = $conf->entity here
+		$sql .= ' AND entity = '.(int) $conf->entity; // MUST STAY = $conf->entity here
 		if ($restrictioninvoiceid > 0) {
-			$sql .= ' AND rowid = '. (int) $restrictioninvoiceid;
+			$sql .= ' AND rowid = '.(int) $restrictioninvoiceid;
 		}
 		$sql .= $this->db->order('entity', 'ASC');
 		//print $sql;exit;
@@ -1411,7 +1411,7 @@ 
 					// Set entity context
 					$conf->entity = $facturerec->entity;
 
-					dol_syslog('createRecurringInvoices Process invoice template id=' .$facturerec->id. ', ref=' .$facturerec->ref. ', entity=' .$facturerec->entity);
+					dol_syslog('createRecurringInvoices Process invoice template id='.$facturerec->id.', ref='.$facturerec->ref.', entity='.$facturerec->entity);
 
 					$new_fac_fourn = new FactureFournisseur($this->db);
 					$new_fac_fourn->fac_rec = $facturerec->id; // We will create $facture from this recurring invoice
@@ -1419,7 +1419,7 @@ 
 
 					$new_fac_fourn->type = self::TYPE_STANDARD;
 					$new_fac_fourn->subtype = $facturerec->subtype;
-					$new_fac_fourn->statut = self::STATUS_DRAFT;	// deprecated
+					$new_fac_fourn->statut = self::STATUS_DRAFT; // deprecated
 					$new_fac_fourn->status = self::STATUS_DRAFT;
 					$new_fac_fourn->date = empty($facturerec->date_when) ? $now : $facturerec->date_when; // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
 					$new_fac_fourn->socid = $facturerec->socid;
@@ -1428,7 +1428,7 @@ 
 					$new_fac_fourn->model_pdf = $facturerec->model_pdf;
 					$new_fac_fourn->fk_project = $facturerec->fk_project;
 					$new_fac_fourn->label = $facturerec->label;
-					$new_fac_fourn->libelle = $facturerec->label;	// deprecated
+					$new_fac_fourn->libelle = $facturerec->label; // deprecated
 
 					$invoiceidgenerated = $new_fac_fourn->create($user);
 					$laststep = "Create invoiceidgenerated $invoiceidgenerated";
@@ -1461,9 +1461,9 @@ 
 					}
 				} else {
 					$error++;
-					$this->error = 'Failed to load invoice template with id=' .$line->rowid. ', entity=' .$conf->entity."\n";
-					$this->errors[] = 'Failed to load invoice template with id=' .$line->rowid. ', entity=' .$conf->entity;
-					dol_syslog('createRecurringInvoices Failed to load invoice template with id=' .$line->rowid. ', entity=' .$conf->entity);
+					$this->error = 'Failed to load invoice template with id='.$line->rowid.', entity='.$conf->entity."\n";
+					$this->errors[] = 'Failed to load invoice template with id='.$line->rowid.', entity='.$conf->entity;
+					dol_syslog('createRecurringInvoices Failed to load invoice template with id='.$line->rowid.', entity='.$conf->entity);
 				}
 
 				if (!$error && $invoiceidgenerated >= 0) {
@@ -1472,12 +1472,12 @@ 
 					$nextDate = $facturerec->getNextDate();
 					$facturerec->date_when = (($nextDate === false) ? null : $nextDate);
 					$facturerec->update($user);
-					$this->db->commit('createRecurringInvoices Process invoice template id=' .$facturerec->id. ', title=' .$facturerec->title);
-					dol_syslog('createRecurringInvoices Process invoice template ' .$facturerec->title. ' is finished with a success generation');
+					$this->db->commit('createRecurringInvoices Process invoice template id='.$facturerec->id.', title='.$facturerec->title);
+					dol_syslog('createRecurringInvoices Process invoice template '.$facturerec->title.' is finished with a success generation');
 					$nb_create++;
 					$this->output .= $langs->trans('InvoiceGeneratedFromTemplate', $new_fac_fourn->ref, $facturerec->title)."\n";
 				} else {
-					$this->db->rollback('createRecurringInvoices Process invoice template error='.$error.' invoiceidgenerated='.$invoiceidgenerated.' LastStep='.$laststep.' id=' .$facturerec->id. ', title=' .$facturerec->title);
+					$this->db->rollback('createRecurringInvoices Process invoice template error='.$error.' invoiceidgenerated='.$invoiceidgenerated.' LastStep='.$laststep.' id='.$facturerec->id.', title='.$facturerec->title);
 				}
 
 				$parameters = array(
@@ -1571,7 +1571,7 @@ 
 		}
 		$result .= $linkend;
 		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) {
@@ -1751,8 +1751,8 @@ 
 		$prodids = array();
 
 		$sql = 'SELECT rowid';
-		$sql .= ' FROM ' .MAIN_DB_PREFIX. 'product';
-		$sql .= ' WHERE entity IN (' .getEntity('product'). ')';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'product';
+		$sql .= ' WHERE entity IN ('.getEntity('product').')';
 		$sql .= $this->db->plimit(100);
 
 		$resql = $this->db->query($sql);
@@ -1787,11 +1787,11 @@ 
 
 		if (empty($option) || $option != 'nolines') {
 			// Lines
-			$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5);	// We can force the nb of lines to test from command line (but not more than 1000)
+			$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5); // We can force the nb of lines to test from command line (but not more than 1000)
 			$xnbp = 0;
 			while ($xnbp < $nbp) {
 				$line = new FactureLigne($this->db);
-				$line->desc = $langs->trans('Description'). ' ' .$xnbp;
+				$line->desc = $langs->trans('Description').' '.$xnbp;
 				$line->qty = 1;
 				$line->subprice = 100;
 				$line->tva_tx = 19.6;
@@ -1838,7 +1838,7 @@ 
 
 			// Add a line "offered"
 			$line = new FactureLigne($this->db);
-			$line->desc = $langs->trans('Description'). ' (offered line)';
+			$line->desc = $langs->trans('Description').' (offered line)';
 			$line->qty = 1;
 			$line->subprice = 100;
 			$line->tva_tx = 19.6;
@@ -1887,12 +1887,12 @@ 
 	public function setFrequencyAndUnit($frequency, $unit)
 	{
 		if (!$this->table_element) {
-			dol_syslog(get_class($this). '::setFrequencyAndUnit was called on object with property table_element not defined', LOG_ERR);
+			dol_syslog(get_class($this).'::setFrequencyAndUnit was called on object with property table_element not defined', LOG_ERR);
 			return -1;
 		}
 
 		if (!empty($frequency) && empty($unit)) {
-			dol_syslog(get_class($this). '::setFrequencyAndUnit was called on object with params frequency defined but unit not defined', LOG_ERR);
+			dol_syslog(get_class($this).'::setFrequencyAndUnit was called on object with params frequency defined but unit not defined', LOG_ERR);
 			return -2;
 		}
 
@@ -1931,11 +1931,11 @@ 
 			return -1;
 		}
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql .= " SET date_when = " .($date ? "'".$this->db->idate($date)."'" : "NULL");
+		$sql .= " SET date_when = ".($date ? "'".$this->db->idate($date)."'" : "NULL");
 		if ($increment_nb_gen_done > 0) {
 			$sql .= ", nb_gen_done = nb_gen_done + 1";
 		}
-		$sql .= " WHERE rowid = " . (int) $this->id;
+		$sql .= " WHERE rowid = ".(int) $this->id;
 
 		dol_syslog(get_class($this).'::setNextDate', LOG_DEBUG);
 
@@ -1969,8 +1969,8 @@ 
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql .= " SET nb_gen_max = ". (int) $nb;
-		$sql .= " WHERE rowid = " . (int) $this->id;
+		$sql .= " SET nb_gen_max = ".(int) $nb;
+		$sql .= " WHERE rowid = ".(int) $this->id;
 
 		dol_syslog(get_class($this).'::setMaxPeriod', LOG_DEBUG);
 
@@ -1998,7 +1998,7 @@ 
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET auto_validate = ".((int) $validate);
-		$sql .= " WHERE rowid = " . (int) $this->id;
+		$sql .= " WHERE rowid = ".(int) $this->id;
 
 		dol_syslog(get_class($this).'::setAutoValidate', LOG_DEBUG);
 
@@ -2025,8 +2025,8 @@ 
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql .= " SET generate_pdf = ". (int) $validate;
-		$sql .= " WHERE rowid = " . (int) $this->id;
+		$sql .= " SET generate_pdf = ".(int) $validate;
+		$sql .= " WHERE rowid = ".(int) $this->id;
 
 		dol_syslog(get_class($this).'::setGeneratePdf', LOG_DEBUG);
 
@@ -2054,7 +2054,7 @@ 
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET modelpdf = '".$this->db->escape($model)."'";
-		$sql .= " WHERE rowid = " . (int) $this->id;
+		$sql .= " WHERE rowid = ".(int) $this->id;
 
 		dol_syslog(get_class($this).'::setModelPdf', LOG_DEBUG);
 

htdocs/fourn/class/fournisseur.facture-rec.ligne.class.php

Spacing +41 added lines, -41 removed lines

@@ -192,8 +192,8 @@ 
 		$error = 0;
 		$this->db->begin();
 
-		if (! $error) {
-			if (! $notrigger) {
+		if (!$error) {
+			if (!$notrigger) {
 				// Call triggers
 				$result = $this->call_trigger('LINESUPPLIERBILLREC_DELETE', $user);
 				if ($result < 0) {
@@ -203,15 +203,15 @@ 
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$result = $this->deleteExtraFields();
 			if ($result < 0) {
 				$error++;
 			}
 		}
 
-		if (! $error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element . ' WHERE rowid=' . (int) $this->id;
+		if (!$error) {
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.(int) $this->id;
 
 			$res = $this->db->query($sql);
 			if ($res === false) {
@@ -251,7 +251,7 @@ 
 		$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det_rec as l';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-		$sql .= ' WHERE l.rowid = '. (int) $rowid;
+		$sql .= ' WHERE l.rowid = '.(int) $rowid;
 		$sql .= ' ORDER BY l.rang';
 
 		dol_syslog('FactureRec::fetch', LOG_DEBUG);
@@ -266,7 +266,7 @@ 
 			$this->ref_supplier             = $objp->ref_supplier;
 			$this->label                    = $objp->label;
 			$this->description              = $objp->line_desc;
-			$this->desc			            = $objp->line_desc;
+			$this->desc = $objp->line_desc;
 			$this->pu_ht                    = $objp->pu_ht;
 			$this->pu_ttc                   = $objp->pu_ttc;
 			$this->qty                      = $objp->qty;
@@ -291,7 +291,7 @@ 
 			$this->rang                     = $objp->rang;
 			$this->fk_unit                  = $objp->fk_unit;
 			$this->import_key               = $objp->import_key;
-			$this->extraparams 				= !empty($objp->extraparams) ? (array) json_decode($objp->extraparams, true) : array();
+			$this->extraparams = !empty($objp->extraparams) ? (array) json_decode($objp->extraparams, true) : array();
 			$this->fk_user_author           = $objp->fk_user_author;
 			$this->fk_user_modif            = $objp->fk_user_modif;
 			$this->fk_multicurrency         = $objp->fk_multicurrency;
@@ -325,44 +325,44 @@ 
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facture_fourn_det_rec SET';
-		$sql .= ' fk_facture_fourn = ' . (int) $this->fk_facture_fourn;
-		$sql .= ', fk_parent_line = ' . (int) $this->fk_parent;
-		$sql .= ', fk_product = ' . (int) $this->fk_product;
-		$sql .= ', ref = ' . (!empty($this->ref) ? "'" . $this->db->escape($this->ref) . "'" : 'NULL');
-		$sql .= ", label = " . (!empty($this->label) ? "'" . $this->db->escape($this->label) . "'" : 'NULL');
-		$sql .= ", description = '" . $this->db->escape($this->desc ? $this->desc : $this->description) . "'";
-		$sql .= ', pu_ht = ' . price2num($this->pu_ht);
-		$sql .= ', pu_ttc = ' . price2num($this->pu_ttc);
-		$sql .= ', qty = ' . price2num($this->qty);
-		$sql .= ", remise_percent = '" . price2num($this->remise_percent) . "'";
-		$sql .= ', fk_remise_except = ' . (int) $this->fk_remise_except;
-		$sql .= ", vat_src_code = '" . $this->db->escape($this->vat_src_code) . "'";
-		$sql .= ', tva_tx = ' . price2num($this->tva_tx);
-		$sql .= ', localtax1_tx = ' . price2num($this->localtax1_tx);
-		$sql .= ", localtax1_type = '" . $this->db->escape($this->localtax1_type) . "'";
-		$sql .= ', localtax2_tx = ' . price2num($this->localtax2_tx);
-		$sql .= ", localtax2_type = '" . $this->db->escape($this->localtax2_type) . "'";
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn_det_rec SET';
+		$sql .= ' fk_facture_fourn = '.(int) $this->fk_facture_fourn;
+		$sql .= ', fk_parent_line = '.(int) $this->fk_parent;
+		$sql .= ', fk_product = '.(int) $this->fk_product;
+		$sql .= ', ref = '.(!empty($this->ref) ? "'".$this->db->escape($this->ref)."'" : 'NULL');
+		$sql .= ", label = ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : 'NULL');
+		$sql .= ", description = '".$this->db->escape($this->desc ? $this->desc : $this->description)."'";
+		$sql .= ', pu_ht = '.price2num($this->pu_ht);
+		$sql .= ', pu_ttc = '.price2num($this->pu_ttc);
+		$sql .= ', qty = '.price2num($this->qty);
+		$sql .= ", remise_percent = '".price2num($this->remise_percent)."'";
+		$sql .= ', fk_remise_except = '.(int) $this->fk_remise_except;
+		$sql .= ", vat_src_code = '".$this->db->escape($this->vat_src_code)."'";
+		$sql .= ', tva_tx = '.price2num($this->tva_tx);
+		$sql .= ', localtax1_tx = '.price2num($this->localtax1_tx);
+		$sql .= ", localtax1_type = '".$this->db->escape($this->localtax1_type)."'";
+		$sql .= ', localtax2_tx = '.price2num($this->localtax2_tx);
+		$sql .= ", localtax2_type = '".$this->db->escape($this->localtax2_type)."'";
 		if (empty($this->skip_update_total)) {
-			$sql .= ', total_ht = ' . price2num($this->total_ht);
-			$sql .= ', total_tva = ' . price2num($this->total_tva);
-			$sql .= ', total_localtax1 = ' . price2num($this->total_localtax1);
-			$sql .= ', total_localtax2 = ' . price2num($this->total_localtax2);
-			$sql .= ', total_ttc = ' . price2num($this->total_ttc);
+			$sql .= ', total_ht = '.price2num($this->total_ht);
+			$sql .= ', total_tva = '.price2num($this->total_tva);
+			$sql .= ', total_localtax1 = '.price2num($this->total_localtax1);
+			$sql .= ', total_localtax2 = '.price2num($this->total_localtax2);
+			$sql .= ', total_ttc = '.price2num($this->total_ttc);
 		}
-		$sql .= ', product_type = ' . (int) $this->product_type;
-		$sql .= ', date_start = ' . (int) $this->date_start;
-		$sql .= ', date_end = ' . (int) $this->date_end;
-		$sql .= ", info_bits = " . ((int) $this->info_bits);
-		$sql .= ', special_code =' . (int) $this->special_code;
-		$sql .= ', rang = ' . (int) $this->rang;
-		$sql .= ', fk_unit = ' .($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : 'null');
-		$sql .= ', fk_user_modif = ' . (int) $user->id;
-		$sql .= ' WHERE rowid = ' . (int) $this->id;
+		$sql .= ', product_type = '.(int) $this->product_type;
+		$sql .= ', date_start = '.(int) $this->date_start;
+		$sql .= ', date_end = '.(int) $this->date_end;
+		$sql .= ", info_bits = ".((int) $this->info_bits);
+		$sql .= ', special_code ='.(int) $this->special_code;
+		$sql .= ', rang = '.(int) $this->rang;
+		$sql .= ', fk_unit = '.($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : 'null');
+		$sql .= ', fk_user_modif = '.(int) $user->id;
+		$sql .= ' WHERE rowid = '.(int) $this->id;
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this). '::updateline', LOG_DEBUG);
+		dol_syslog(get_class($this).'::updateline', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if (!$error) {

htdocs/public/onlinesign/newonlinesign.php

Spacing +20 added lines, -20 removed lines

@@ -238,7 +238,7 @@ 
 
 $head = '';
 if (getDolGlobalString('MAIN_SIGN_CSS_URL')) {
-	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('MAIN_SIGN_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
+	$head = '<link rel="stylesheet" type="text/css" href="'.getDolGlobalString('MAIN_SIGN_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
 $conf->dol_hide_topmenu = 1;
@@ -317,7 +317,7 @@ 
 }
 if ($source == 'proposal' && getDolGlobalString('PROPOSAL_IMAGE_PUBLIC_SIGN')) {
 	print '<div class="backimagepublicproposalsign">';
-	print '<img id="idPROPOSAL_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('PROPOSAL_IMAGE_PUBLIC_SIGN').'">';
+	print '<img id="idPROPOSAL_IMAGE_PUBLIC_INTERFACE" src="'.getDolGlobalString('PROPOSAL_IMAGE_PUBLIC_SIGN').'">';
 	print '</div>';
 }
 
@@ -328,7 +328,7 @@ 
 	if (preg_match('/^\((.*)\)$/', $conf->global->ONLINE_SIGN_NEWFORM_TEXT, $reg)) {
 		$text .= $langs->trans($reg[1])."<br>\n";
 	} else {
-		$text .= getDolGlobalString('ONLINE_SIGN_NEWFORM_TEXT') . "<br>\n";
+		$text .= getDolGlobalString('ONLINE_SIGN_NEWFORM_TEXT')."<br>\n";
 	}
 	$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
@@ -423,7 +423,7 @@ 
 		if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
 			// It seems document has never been generated, or was generated and then deleted.
 			// So we try to regenerate it with its default template.
-			$defaulttemplate = '';		// We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+			$defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
 			$object->generateDocument($defaulttemplate, $langs);
 		}
 
@@ -494,7 +494,7 @@ 
 	if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
 		// It seems document has never been generated, or was generated and then deleted.
 		// So we try to regenerate it with its default template.
-		$defaulttemplate = '';		// We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+		$defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
 		$object->generateDocument($defaulttemplate, $langs);
 	}
 
@@ -545,7 +545,7 @@ 
 	if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
 		// It seems document has never been generated, or was generated and then deleted.
 		// So we try to regenerate it with its default template.
-		$defaulttemplate = '';		// We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+		$defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
 		$object->generateDocument($defaulttemplate, $langs);
 	}
 
@@ -569,24 +569,24 @@ 
 	$result = $object->fetch_thirdparty();
 
 	// Proposer
-	print '<tr class="CTableRow2"><td class="CTableRow2">' . $langs->trans("Proposer");
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Proposer");
 	print '</td><td class="CTableRow2">';
 	print img_picto('', 'company', 'class="pictofixedwidth"');
-	print '<b>' . $creditor . '</b>';
-	print '<input type="hidden" name="creditor" value="' . $creditor . '">';
-	print '</td></tr>' . "\n";
+	print '<b>'.$creditor.'</b>';
+	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
 
 	// Target
-	print '<tr class="CTableRow2"><td class="CTableRow2">' . $langs->trans("ThirdParty");
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow2">';
 	print img_picto('', 'company', 'class="pictofixedwidth"');
-	print '<b>' . $object->thirdparty->name . '</b>';
-	print '</td></tr>' . "\n";
+	print '<b>'.$object->thirdparty->name.'</b>';
+	print '</td></tr>'."\n";
 
 	// Object
-	$text = '<b>' . $langs->trans("Signature" . dol_ucfirst($source) . "Ref", $object->ref) . '</b>';
-	print '<tr class="CTableRow2"><td class="CTableRow2">' . $langs->trans("Designation");
-	print '</td><td class="CTableRow2">' . $text;
+	$text = '<b>'.$langs->trans("Signature".dol_ucfirst($source)."Ref", $object->ref).'</b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow2">'.$text;
 
 	$last_main_doc_file = $object->last_main_doc;
 	$diroutput = $conf->societe->multidir_output[$object->thirdparty->entity].'/'
@@ -649,7 +649,7 @@ 
 	if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
 		// It seems document has never been generated, or was generated and then deleted.
 		// So we try to regenerate it with its default template.
-		$defaulttemplate = '';		// We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+		$defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
 		$object->generateDocument($defaulttemplate, $langs);
 	}
 	$directdownloadlink = $object->getLastMainDocLink('', 0, 0);
@@ -698,7 +698,7 @@ 
 	if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
 		// It seems document has never been generated, or was generated and then deleted.
 		// So we try to regenerate it with its default template.
-		$defaulttemplate = '';		// We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+		$defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
 		$object->generateDocument($defaulttemplate, $langs);
 	}
 
@@ -758,8 +758,8 @@ 
 	print '</div>';
 
 	// Define $urlwithroot
-	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 	//$urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
 	// TODO Replace DOL_URL_ROOT with $urlwithroot ?
 

htdocs/public/bookcal/index.php

Spacing +3 added lines, -3 removed lines

@@ -177,7 +177,7 @@ 
 	if (getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC')) {
 		print '<div class="clearboth"></div><strong>'.(getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC') ? getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC') : $langs->trans("BookCalSystem")).'</strong>';
 	}
-	if (empty($urllogo) && ! getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC')) {
+	if (empty($urllogo) && !getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC')) {
 		print $mysoc->name;
 	}
 	print '</div>';
@@ -312,8 +312,8 @@ 
 
 
 // Define $urlwithroot
-$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 //$urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
 // TODO Replace DOL_URL_ROOT with $urlwithroot ?
 

test/phpunit/FunctionsLibTest.php

Spacing +80 added lines, -80 removed lines

@@ -25,7 +25,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db,$mysoc;
+global $conf, $user, $langs, $db, $mysoc;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -33,35 +33,35 @@ 
 require_once dirname(__FILE__).'/../../htdocs/product/class/product.class.php';
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
-if (! defined('NOREQUIREUSER')) {
+if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }
-if (! defined('NOREQUIREDB')) {
+if (!defined('NOREQUIREDB')) {
 	define('NOREQUIREDB', '1');
 }
-if (! defined('NOREQUIRESOC')) {
+if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (! defined('NOREQUIRETRAN')) {
+if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
-if (! defined('NOCSRFCHECK')) {
+if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
-if (! defined('NOTOKENRENEWAL')) {
+if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
-if (! defined('NOREQUIREMENU')) {
+if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1'); // If there is no menu to show
 }
-if (! defined('NOREQUIREHTML')) {
+if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 }
-if (! defined('NOREQUIREAJAX')) {
+if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
-if (! defined("NOLOGIN")) {
-	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
 
 print "\n".$langs->trans("CurrentTimeZone").' : '.getServerTimeZoneString();
@@ -85,10 +85,10 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-		if (! function_exists('mb_substr')) {
+		if (!function_exists('mb_substr')) {
 			print "\n".__METHOD__." function mb_substr must be enabled.\n";
 			die(1);
 		}
@@ -256,9 +256,9 @@ 
 		$sql = forgeSQLFromUniversalSearchCriteria($filter);
 
 		if ($db->type == 'mysqli') {
-			$this->assertEquals(" AND ((t.fieldstring = 'aaa\'ttt'))", $sql);	// with mysql
+			$this->assertEquals(" AND ((t.fieldstring = 'aaa\'ttt'))", $sql); // with mysql
 		} else {
-			$this->assertEquals(" AND ((t.fieldstring = 'aaa''ttt'))", $sql);	// with pgsql
+			$this->assertEquals(" AND ((t.fieldstring = 'aaa''ttt'))", $sql); // with pgsql
 		}
 
 		$filter = "(t.fk_soc:IN:1,2)";
@@ -695,13 +695,13 @@ 
 		$input = 'xxx < br>';
 		$after = dol_textishtml($input);
 		$this->assertFalse($after);
-		$input = 'xxx <email@email.com>';	// <em> is html, <em... is not
+		$input = 'xxx <email@email.com>'; // <em> is html, <em... is not
 		$after = dol_textishtml($input);
 		$this->assertFalse($after);
 		$input = 'xxx <brstyle="ee">';
 		$after = dol_textishtml($input);
 		$this->assertFalse($after);
-		$input = 'This is a text with html comments <!-- comment -->';	// we suppose this is not enough to be html content
+		$input = 'This is a text with html comments <!-- comment -->'; // we suppose this is not enough to be html content
 		$after = dol_textishtml($input);
 		$this->assertFalse($after);
 
@@ -757,17 +757,17 @@ 
 	public function testDolConcat()
 	{
 		$text1 = "A string 1";
-		$text2 = "A string 2";	// text 1 and 2 are text, concat need only \n
+		$text2 = "A string 2"; // text 1 and 2 are text, concat need only \n
 		$after = dol_concatdesc($text1, $text2);
 		$this->assertEquals("A string 1\nA string 2", $after);
 
 		$text1 = "A<br>string 1";
-		$text2 = "A string 2";	// text 1 is html, concat need <br>\n
+		$text2 = "A string 2"; // text 1 is html, concat need <br>\n
 		$after = dol_concatdesc($text1, $text2);
 		$this->assertEquals("A<br>string 1<br>\nA string 2", $after);
 
 		$text1 = "A string 1";
-		$text2 = "A <b>string</b> 2";	// text 2 is html, concat need <br>\n
+		$text2 = "A <b>string</b> 2"; // text 2 is html, concat need <br>\n
 		$after = dol_concatdesc($text1, $text2);
 		$this->assertEquals("A string 1<br>\nA <b>string</b> 2", $after);
 
@@ -869,19 +869,19 @@ 
 		// Text not already HTML
 
 		$input = "A string\nwith a é, &, < and >.";
-		$after = dol_htmlentitiesbr($input, 0);    // Add <br> before \n
+		$after = dol_htmlentitiesbr($input, 0); // Add <br> before \n
 		$this->assertEquals("A string<br>\nwith a &eacute;, &amp;, &lt; and &gt;.", $after);
 
 		$input = "A string\nwith a é, &, < and >.";
-		$after = dol_htmlentitiesbr($input, 1);    // Replace \n with <br>
+		$after = dol_htmlentitiesbr($input, 1); // Replace \n with <br>
 		$this->assertEquals("A string<br>with a &eacute;, &amp;, &lt; and &gt;.", $after);
 
-		$input = "A string\nwith a é, &, < and >.\n\n";	// With some \n at end that should be cleaned
-		$after = dol_htmlentitiesbr($input, 0);    // Add <br> before \n
+		$input = "A string\nwith a é, &, < and >.\n\n"; // With some \n at end that should be cleaned
+		$after = dol_htmlentitiesbr($input, 0); // Add <br> before \n
 		$this->assertEquals("A string<br>\nwith a &eacute;, &amp;, &lt; and &gt;.", $after);
 
-		$input = "A string\nwith a é, &, < and >.\n\n";	// With some \n at end that should be cleaned
-		$after = dol_htmlentitiesbr($input, 1);    // Replace \n with <br>
+		$input = "A string\nwith a é, &, < and >.\n\n"; // With some \n at end that should be cleaned
+		$after = dol_htmlentitiesbr($input, 1); // Replace \n with <br>
 		$this->assertEquals("A string<br>with a &eacute;, &amp;, &lt; and &gt;.", $after);
 
 		// Text already HTML, so &,<,> should not be converted
@@ -894,11 +894,11 @@ 
 		$after = dol_htmlentitiesbr($input);
 		$this->assertEquals("<li>\nA string with a &eacute;, &, < and >.</li>\nAnother string", $after);
 
-		$input = "A string<br>\nwith a é, &, < and >.<br>";	// With some <br> at end that should be cleaned
+		$input = "A string<br>\nwith a é, &, < and >.<br>"; // With some <br> at end that should be cleaned
 		$after = dol_htmlentitiesbr($input);
 		$this->assertEquals("A string<br>\nwith a &eacute;, &, < and >.", $after);
 
-		$input = "<li>\nA string with a é, &, < and >.</li>\nAnother string<br>";	// With some <br> at end that should be cleaned
+		$input = "<li>\nA string with a é, &, < and >.</li>\nAnother string<br>"; // With some <br> at end that should be cleaned
 		$after = dol_htmlentitiesbr($input);
 		$this->assertEquals("<li>\nA string with a &eacute;, &, < and >.</li>\nAnother string", $after);
 
@@ -1062,43 +1062,43 @@ 
 		date_default_timezone_set('UTC');
 
 		// Check bad hours
-		$result = dol_mktime(25, 0, 0, 1, 1, 1970, 1, 1);    // Error (25 hours)
+		$result = dol_mktime(25, 0, 0, 1, 1, 1970, 1, 1); // Error (25 hours)
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
-		$result = dol_mktime(2, 61, 0, 1, 1, 1970, 1, 1);    // Error (61 minutes)
+		$result = dol_mktime(2, 61, 0, 1, 1, 1970, 1, 1); // Error (61 minutes)
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
-		$result = dol_mktime(2, 1, 61, 1, 1, 1970, 1, 1);    // Error (61 seconds)
+		$result = dol_mktime(2, 1, 61, 1, 1, 1970, 1, 1); // Error (61 seconds)
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
-		$result = dol_mktime(2, 1, 1, 1, 32, 1970, 1, 1);    // Error (day 32)
+		$result = dol_mktime(2, 1, 1, 1, 32, 1970, 1, 1); // Error (day 32)
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
-		$result = dol_mktime(2, 1, 1, 13, 1, 1970, 1, 1);    // Error (month 13)
+		$result = dol_mktime(2, 1, 1, 13, 1, 1970, 1, 1); // Error (month 13)
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
 
-		$result = dol_mktime(2, 1, 1, 1, 1, 1970, 1);    // 1970-01-01 02:01:01 in GMT area -> 7261
+		$result = dol_mktime(2, 1, 1, 1, 1, 1970, 1); // 1970-01-01 02:01:01 in GMT area -> 7261
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(7261, $result);
 
-		$result = dol_mktime(2, 0, 0, 1, 1, 1970, 0);                // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
+		$result = dol_mktime(2, 0, 0, 1, 1, 1970, 0); // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
 		print __METHOD__." result=".$result."\n";
-		$tz = getServerTimeZoneInt('winter');                  // +1 in Europe/Paris at this time (this time is winter)
-		$this->assertEquals(7200 - ($tz * 3600), $result);        // 7200 if we are at greenwich winter, 7200-($tz*3600) at local winter
+		$tz = getServerTimeZoneInt('winter'); // +1 in Europe/Paris at this time (this time is winter)
+		$this->assertEquals(7200 - ($tz * 3600), $result); // 7200 if we are at greenwich winter, 7200-($tz*3600) at local winter
 
 		// Some test for local TZ Europe/Paris
 		date_default_timezone_set('Europe/Paris');
 
 		// Check that tz for paris in winter is used
-		$result = dol_mktime(2, 0, 0, 1, 1, 1970, 'server');         // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
+		$result = dol_mktime(2, 0, 0, 1, 1, 1970, 'server'); // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(3600, $result);        			 // 7200 if we are at greenwich winter, 3600 at Europe/Paris
+		$this->assertEquals(3600, $result); // 7200 if we are at greenwich winter, 3600 at Europe/Paris
 
 		// Check that daylight saving time is used
-		$result = dol_mktime(2, 0, 0, 6, 1, 2014, 0);         		// 2014-06-01 02:00:00 = 1401588000-3600(location)-3600(daylight) in local area Europe/Paris = 1401588000 GMT
+		$result = dol_mktime(2, 0, 0, 6, 1, 2014, 0); // 2014-06-01 02:00:00 = 1401588000-3600(location)-3600(daylight) in local area Europe/Paris = 1401588000 GMT
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1401588000 - 3600 - 3600, $result);  // 1401588000 are at greenwich summer, 1401588000-3600(location)-3600(daylight) at Europe/Paris summer
+		$this->assertEquals(1401588000 - 3600 - 3600, $result); // 1401588000 are at greenwich summer, 1401588000-3600(location)-3600(daylight) at Europe/Paris summer
 
 		date_default_timezone_set($savtz);
 	}
@@ -1111,7 +1111,7 @@ 
 	 */
 	public function testDolEscapeJs()
 	{
-		$input = "x&<b>#</b>,\"'";    // " will be converted into '
+		$input = "x&<b>#</b>,\"'"; // " will be converted into '
 		$result = dol_escape_js($input);
 		$this->assertEquals("x&<b>#</b>,\'\'", $result, "Test mode=0");
 
@@ -1130,27 +1130,27 @@ 
 	 */
 	public function testDolEscapeHtmlTag()
 	{
-		$input = 'x&<b>#</b>,"';    // & and " are converted into html entities, <b> are removed
+		$input = 'x&<b>#</b>,"'; // & and " are converted into html entities, <b> are removed
 		$result = dol_escape_htmltag($input);
 		$this->assertEquals('x&amp;#,&quot;', $result);
 
-		$input = 'x&<b>#</b>,"';    // & and " are converted into html entities, <b> are not removed
+		$input = 'x&<b>#</b>,"'; // & and " are converted into html entities, <b> are not removed
 		$result = dol_escape_htmltag($input, 1);
 		$this->assertEquals('x&amp;&lt;b&gt;#&lt;/b&gt;,&quot;', $result);
 
-		$input = '<img alt="" src="https://github.githubassets.com/assets/GitHub%20Mark-ea2971cee799.png">';    // & and " are converted into html entities, <b> are not removed
+		$input = '<img alt="" src="https://github.githubassets.com/assets/GitHub%20Mark-ea2971cee799.png">'; // & and " are converted into html entities, <b> are not removed
 		$result = dol_escape_htmltag($input, 1, 1, 'common', 0, 1);
 		$this->assertEquals('<img alt="" src="https://github.githubassets.com/assets/GitHub%20Mark-ea2971cee799.png">', $result);
 
-		$input = '<img src="data:image/png;base64, 123/456+789==" style="height: 123px; width:456px">';    // & and " are converted into html entities, <b> are not removed
+		$input = '<img src="data:image/png;base64, 123/456+789==" style="height: 123px; width:456px">'; // & and " are converted into html entities, <b> are not removed
 		$result = dol_escape_htmltag($input, 1, 1, 'common');
 		$this->assertEquals('<img src="data:image/png;base64, 123/456+789==" style="height: 123px; width:456px">', $result);
 
-		$input = '<img src="data:image/png;base64, 123/456+789==" style="height: 123px; width:456px">';    // & and " are converted into html entities, <b> are not removed
+		$input = '<img src="data:image/png;base64, 123/456+789==" style="height: 123px; width:456px">'; // & and " are converted into html entities, <b> are not removed
 		$result = dol_escape_htmltag($input, 1);
 		$this->assertEquals('&lt;img src=&quot;data:image/png;base64, 123/456+789==&quot; style=&quot;height: 123px; width:456px&quot;&gt;', $result);
 
-		$input = '<img alt="" src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png">';    // & and " are converted into html entities, <b> are not removed
+		$input = '<img alt="" src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png">'; // & and " are converted into html entities, <b> are not removed
 		$result = dol_escape_htmltag($input, 1, 1, 'common', 0, 1);
 		$this->assertEquals('<img alt="" src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png">', $result);
 
@@ -1175,7 +1175,7 @@ 
 	 */
 	public function testDolFormatAddress()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -1213,7 +1213,7 @@ 
 	 */
 	public function testDolPrintPhone()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -1292,13 +1292,13 @@ 
 	public function verifCondDataProvider(): array
 	{
 		return [
-			'Test a true comparison' => ['1==1', true,],
-			'Test a false comparison' => ['1==2', false,],
-			'Test that the conf property of a module reports true when enabled' => ['isModEnabled("facture")', true,],
-			'Test that the conf property of a module reports false when disabled' => ['isModEnabled("moduledummy")', false,],
-			'Test that verifConf(0) returns false' => [0, false,],
-			'Test that verifConf("0") returns false' => ["0", false,],
-			'Test that verifConf("") returns false (special case)' => ['', true,],
+			'Test a true comparison' => ['1==1', true, ],
+			'Test a false comparison' => ['1==2', false, ],
+			'Test that the conf property of a module reports true when enabled' => ['isModEnabled("facture")', true, ],
+			'Test that the conf property of a module reports false when disabled' => ['isModEnabled("moduledummy")', false, ],
+			'Test that verifConf(0) returns false' => [0, false, ],
+			'Test that verifConf("0") returns false' => ["0", false, ],
+			'Test that verifConf("") returns false (special case)' => ['', true, ],
 		];
 	}
 
@@ -1328,7 +1328,7 @@ 
 	 */
 	public function testGetDefaultTva()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$this->savconf = $conf;
 		$this->savuser = $user;
 		$this->savlangs = $langs;
@@ -1431,7 +1431,7 @@ 
 	 */
 	public function testGetDefaultLocalTax()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$this->savconf = $conf;
 		$this->savuser = $user;
 		$this->savlangs = $langs;
@@ -1487,7 +1487,7 @@ 
 		$vat1 = get_default_localtax($companyes, $companyes, 1, 0);
 		$vat2 = get_default_localtax($companyes, $companyes, 2, 0);
 		$this->assertEquals($vat1, 5.2);
-		$this->assertStringStartsWith((string) $vat2, '-19:-15:-9');       // Can be -19 (old version) or '-19:-15:-9' (new setup)
+		$this->assertStringStartsWith((string) $vat2, '-19:-15:-9'); // Can be -19 (old version) or '-19:-15:-9' (new setup)
 
 		// Test RULE ES-IT
 		$vat1 = get_default_localtax($companyes, $companyit, 1, 0);
@@ -1675,48 +1675,48 @@ 
 
 		$conf->global->MAIN_START_WEEK = 0;
 
-		$tmp = dol_getdate(24 * 60 * 60 + 1, false, 'UTC');		// 2/1/1970 and 1 second = friday
+		$tmp = dol_getdate(24 * 60 * 60 + 1, false, 'UTC'); // 2/1/1970 and 1 second = friday
 		$this->assertEquals(5, $tmp['wday'], 'Bad value of day in week');
 
 		$conf->global->MAIN_START_WEEK = 1;
 
-		$tmp = dol_getdate(1, false, 'UTC');				// 1/1/1970 and 1 second = thirday
+		$tmp = dol_getdate(1, false, 'UTC'); // 1/1/1970 and 1 second = thirday
 		$this->assertEquals(4, $tmp['wday'], 'Bad value of day in week');
 
-		$tmp = dol_getdate(24 * 60 * 60 + 1, false, 'UTC');		// 2/1/1970 and 1 second = friday
+		$tmp = dol_getdate(24 * 60 * 60 + 1, false, 'UTC'); // 2/1/1970 and 1 second = friday
 		$this->assertEquals(5, $tmp['wday'], 'Bad value of day in week');
 
-		$tmp = dol_getdate(1, false, "Europe/Paris");						// 1/1/1970 and 1 second = thirday
+		$tmp = dol_getdate(1, false, "Europe/Paris"); // 1/1/1970 and 1 second = thirday
 		$this->assertEquals(1970, $tmp['year']);
 		$this->assertEquals(1, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
 		$this->assertEquals(4, $tmp['wday']);
 		$this->assertEquals(0, $tmp['yday']);
-		$this->assertEquals(1, $tmp['hours']);		// We are winter, so we are GMT+1 even during summer
+		$this->assertEquals(1, $tmp['hours']); // We are winter, so we are GMT+1 even during summer
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
-		$tmp = dol_getdate(15638401, false, "Europe/Paris");					// 1/7/1970 and 1 second = wednesday
+		$tmp = dol_getdate(15638401, false, "Europe/Paris"); // 1/7/1970 and 1 second = wednesday
 		$this->assertEquals(1970, $tmp['year']);
 		$this->assertEquals(7, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
 		$this->assertEquals(3, $tmp['wday']);
 		$this->assertEquals(181, $tmp['yday']);
-		$this->assertEquals(1, $tmp['hours']);		// There is no daylight in 1970, so we are GMT+1 even during summer
+		$this->assertEquals(1, $tmp['hours']); // There is no daylight in 1970, so we are GMT+1 even during summer
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
-		$tmp = dol_getdate(1593561601, false, "Europe/Paris");				// 1/7/2020 and 1 second = wednesday
+		$tmp = dol_getdate(1593561601, false, "Europe/Paris"); // 1/7/2020 and 1 second = wednesday
 		$this->assertEquals(2020, $tmp['year']);
 		$this->assertEquals(7, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
 		$this->assertEquals(3, $tmp['wday']);
-		$this->assertEquals(182, $tmp['yday']);		// 182 and not 181, due to the 29th february
-		$this->assertEquals(2, $tmp['hours']);		// There is a daylight, so we are GMT+2
+		$this->assertEquals(182, $tmp['yday']); // 182 and not 181, due to the 29th february
+		$this->assertEquals(2, $tmp['hours']); // There is a daylight, so we are GMT+2
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
-		$tmp = dol_getdate(1, false, 'UTC');						// 1/1/1970 and 1 second = thirday
+		$tmp = dol_getdate(1, false, 'UTC'); // 1/1/1970 and 1 second = thirday
 		$this->assertEquals(1970, $tmp['year']);
 		$this->assertEquals(1, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
@@ -1727,7 +1727,7 @@ 
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
-		$tmp = dol_getdate(15638401, false, 'UTC');				// 1/7/1970 and 1 second = wednesday
+		$tmp = dol_getdate(15638401, false, 'UTC'); // 1/7/1970 and 1 second = wednesday
 		$this->assertEquals(1970, $tmp['year']);
 		$this->assertEquals(7, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
@@ -1738,12 +1738,12 @@ 
 		$this->assertEquals(0, $tmp['minutes']);
 		$this->assertEquals(1, $tmp['seconds']);
 
-		$tmp = dol_getdate(1593561601, false, 'UTC');				// 1/7/2020 and 1 second = wednesday
+		$tmp = dol_getdate(1593561601, false, 'UTC'); // 1/7/2020 and 1 second = wednesday
 		$this->assertEquals(2020, $tmp['year']);
 		$this->assertEquals(7, $tmp['mon']);
 		$this->assertEquals(1, $tmp['mday']);
 		$this->assertEquals(3, $tmp['wday']);
-		$this->assertEquals(182, $tmp['yday']);		// 182 and not 181, due to the 29th february
+		$this->assertEquals(182, $tmp['yday']); // 182 and not 181, due to the 29th february
 		// We must disable this because on CI, timezone is may be UTC or something else
 		//$this->assertEquals(2, $tmp['hours']);	// There is a daylight, so we are GMT+2
 		$this->assertEquals(0, $tmp['minutes']);
@@ -1933,16 +1933,16 @@ 
 		$s = natural_search("t.field", "'abc def' ghi");
 		$this->assertEquals(" AND (t.field LIKE '%abc def%' AND t.field LIKE '%ghi%')", $s);
 
-		$s = natural_search("t.field", "abc def,ghi", 3);				// mode 3 is to provide a list of string separated with coma
+		$s = natural_search("t.field", "abc def,ghi", 3); // mode 3 is to provide a list of string separated with coma
 		$this->assertEquals(" AND (t.field IN ('abc def','ghi'))", $s);
 
-		$s = natural_search("t.field", "'ab\'c' def','ghi', 'jkl'", 3);	// mode 3 is to provide a list of string separated with coma
+		$s = natural_search("t.field", "'ab\'c' def','ghi', 'jkl'", 3); // mode 3 is to provide a list of string separated with coma
 		$this->assertEquals(" AND (t.field IN ('abc def','ghi','jkl'))", $s);
 
-		$s = natural_search("t.field", "a,b", 3);						// mode 3 is to provide a list of string separated with coma
+		$s = natural_search("t.field", "a,b", 3); // mode 3 is to provide a list of string separated with coma
 		$this->assertEquals(" AND (t.field IN ('a','b'))", $s);
 
-		$s = natural_search("t.field", "A'@%B", 3);						// mode 3 is to provide a list of string separated with coma
+		$s = natural_search("t.field", "A'@%B", 3); // mode 3 is to provide a list of string separated with coma
 		$this->assertEquals(" AND (t.field IN ('AB'))", $s);
 
 		/*
@@ -1954,7 +1954,7 @@ 
 		var_dump($s);
 		*/
 
-		$s = natural_search("t.field", "KØB", 3);						// mode 3 is to provide a list of string separated with coma
+		$s = natural_search("t.field", "KØB", 3); // mode 3 is to provide a list of string separated with coma
 		$this->assertEquals(" AND (t.field IN ('KØB'))", $s);
 	}
 }