Dolibarr / dolibarr

htdocs/societe/class/api_contacts.class.php

Spacing +2 added lines, -2 removed lines

@@ -224,7 +224,7 @@ 
 						if ($searchCategoryContactOperator == 0) {
 							$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_socpeople FROM ".MAIN_DB_PREFIX."categorie_contact as ck WHERE t.rowid = ck.fk_socpeople AND ck.fk_categorie = ".((int) $searchCategoryContact).")";
 						} else {
-							$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryContact);
+							$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryContact);
 						}
 					}
 				}
@@ -438,7 +438,7 @@ 
 		$this->contact->oldcopy = clone $this->contact; // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		if ($this->contact->delete(DolibarrApiAccess::$user) <= 0) {
-			throw new RestException(500, 'Error when delete contact ' . $this->contact->error);
+			throw new RestException(500, 'Error when delete contact '.$this->contact->error);
 		}
 
 		return array(

htdocs/includes/odtphp/zip/PclZipProxy.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('ODTPHP_PATHTOPCLZIP')) {
+if (!defined('ODTPHP_PATHTOPCLZIP')) {
 	define('ODTPHP_PATHTOPCLZIP', DOL_DOCUMENT_ROOT.'/includes/odtphp/zip/pclzip/');
 }
 require_once ODTPHP_PATHTOPCLZIP.'pclzip.lib.php';
@@ -28,13 +28,13 @@ 
      *
      * @throws PclZipProxyException
      */
-	public function __construct($forcedir='')
+	public function __construct($forcedir = '')
 	{
-		if (! class_exists('PclZip')) {
+		if (!class_exists('PclZip')) {
 			throw new PclZipProxyException('PclZip class not loaded - PclZip library
 			 is required for using PclZipProxy'); ;
 		}
-		if ($forcedir) $this->tmpdir=preg_replace('|[//\/]$|','',$forcedir);	// $this->tmpdir must not contains / at the end
+		if ($forcedir) $this->tmpdir = preg_replace('|[//\/]$|', '', $forcedir); // $this->tmpdir must not contains / at the end
 	}
 
 	/**
@@ -91,11 +91,11 @@ 
 		}
 		$localname = preg_replace("/(?:\.|\/)*(.*)/", "\\1", $localname);
 		$localpath = dirname($localname);
-		$tmpfilename = $this->tmpdir . '/' . basename($localname);
+		$tmpfilename = $this->tmpdir.'/'.basename($localname);
 		if (false !== file_put_contents($tmpfilename, $contents)) {
 			//print "tmpfilename=".$tmpfilename;
 			//print "localname=".$localname;
-			$res=$this->pclzip->delete(PCLZIP_OPT_BY_NAME, $localname);
+			$res = $this->pclzip->delete(PCLZIP_OPT_BY_NAME, $localname);
 			$add = $this->pclzip->add($tmpfilename,
 				PCLZIP_OPT_REMOVE_PATH, $this->tmpdir,
 				PCLZIP_OPT_ADD_PATH, $localpath);
@@ -126,10 +126,10 @@ 
 		if (isSet($localname)) {
 			$localname = preg_replace("/(?:\.|\/)*(.*)/", "\\1", $localname);
 			$localpath = dirname($localname);
-			$tmpfilename = $this->tmpdir . '/' . basename($localname);
+			$tmpfilename = $this->tmpdir.'/'.basename($localname);
 		} else {
 			$localname = basename($filename);
-			$tmpfilename = $this->tmpdir . '/' . $localname;
+			$tmpfilename = $this->tmpdir.'/'.$localname;
 			$localpath = '';
 		}
 		if (file_exists($filename)) {

htdocs/variants/class/ProductCombination.class.php

Spacing +3 added lines, -3 removed lines

@@ -650,7 +650,7 @@ 
 			 * @param mixed $v Feature information of a product.
 			 * @return bool
 			 */
-			static function ($v) {
+			static function($v) {
 				return !empty($v);
 			}
 		);
@@ -854,7 +854,7 @@ 
 
 			if ($forced_refvar === false) {
 				if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {
-					$newproduct->ref .= getDolGlobalString('PRODUIT_ATTRIBUTES_SEPARATOR') . $prodattrval->ref;
+					$newproduct->ref .= getDolGlobalString('PRODUIT_ATTRIBUTES_SEPARATOR').$prodattrval->ref;
 				} else {
 					$newproduct->ref .= '_'.$prodattrval->ref;
 				}
@@ -882,7 +882,7 @@ 
 				$productCombinationLevel->variation_price = $price_impact[$i];
 
 				if (is_array($price_var_percent)) {
-					$productCombinationLevel->variation_price_percentage = (bool) $price_var_percent[$i] ;
+					$productCombinationLevel->variation_price_percentage = (bool) $price_var_percent[$i];
 				} else {
 					$productCombinationLevel->variation_price_percentage = $price_var_percent;
 				}

htdocs/variants/class/ProductAttribute.class.php

Spacing +110 added lines, -110 removed lines

@@ -229,32 +229,32 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$this->db->begin();
 
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " (";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
 		$sql .= " ref, ref_ext, label, entity, position";
 		$sql .= ")";
 		$sql .= " VALUES (";
-		$sql .= "  '" . $this->db->escape($this->ref) . "'";
-		$sql .= ", '" . $this->db->escape($this->ref_ext) . "'";
-		$sql .= ", '" . $this->db->escape($this->label) . "'";
-		$sql .= ", " . ((int) $this->entity);
-		$sql .= ", " . ((int) $this->position);
+		$sql .= "  '".$this->db->escape($this->ref)."'";
+		$sql .= ", '".$this->db->escape($this->ref_ext)."'";
+		$sql .= ", '".$this->db->escape($this->label)."'";
+		$sql .= ", ".((int) $this->entity);
+		$sql .= ", ".((int) $this->position);
 		$sql .= ")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 			$error++;
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 			$result = $this->insertExtraFields();
 			if ($result < 0) {
 				$error++;
@@ -299,20 +299,20 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$sql = "SELECT rowid, ref, ref_ext, label, position";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE rowid = " . ((int) $id);
-		$sql .= " AND entity IN (" . getEntity('product') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE rowid = ".((int) $id);
+		$sql .= " AND entity IN (".getEntity('product').")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			$this->errors[] = "Error ".$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
@@ -343,14 +343,14 @@ 
 		$return = array();
 
 		$sql = "SELECT rowid, ref, ref_ext, label, position";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE entity IN (".getEntity('product').")";
 		$sql .= $this->db->order("position", "asc");
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 			dol_print_error($this->db);
 			return $return;
 		}
@@ -402,25 +402,25 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$this->db->begin();
 
-		$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET";
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
 
-		$sql .= "  ref = '" . $this->db->escape($this->ref) . "'";
-		$sql .= ", ref_ext = '" . $this->db->escape($this->ref_ext) . "'";
-		$sql .= ", label = '" . $this->db->escape($this->label) . "'";
-		$sql .= ", position = " . ((int) $this->position);
+		$sql .= "  ref = '".$this->db->escape($this->ref)."'";
+		$sql .= ", ref_ext = '".$this->db->escape($this->ref_ext)."'";
+		$sql .= ", label = '".$this->db->escape($this->label)."'";
+		$sql .= ", position = ".((int) $this->position);
 
-		$sql .= " WHERE rowid = " . ((int) $this->id);
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 			$error++;
 		}
 		if (!$error) {
@@ -468,7 +468,7 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
@@ -493,25 +493,25 @@ 
 
 		if (!$error) {
 			// Delete values
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element_line;
-			$sql .= " WHERE " . $this->fk_element . " = " . ((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element_line;
+			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
 
-			dol_syslog(__METHOD__ . ' - Delete values', LOG_DEBUG);
+			dol_syslog(__METHOD__.' - Delete values', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$this->errors[] = "Error " . $this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
 				$error++;
 			}
 		}
 
 		if (!$error) {
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= " WHERE rowid = " . ((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
-			dol_syslog(__METHOD__ . ' - Delete attribute', LOG_DEBUG);
+			dol_syslog(__METHOD__.' - Delete attribute', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$this->errors[] = "Error " . $this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
 				$error++;
 			}
 		}
@@ -550,15 +550,15 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$sql = "SELECT td.rowid, td.fk_product_attribute, td.ref, td.value, td.position";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element_line . " AS td";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $this->table_element . " AS t ON t.rowid = td." . $this->fk_element;
-		$sql .= " WHERE t.rowid = " . ((int) $this->id);
-		$sql .= " AND t.entity IN (" . getEntity('product') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element_line." AS td";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$this->table_element." AS t ON t.rowid = td.".$this->fk_element;
+		$sql .= " WHERE t.rowid = ".((int) $this->id);
+		$sql .= " AND t.entity IN (".getEntity('product').")";
 		if ($filters) {
 			$sql .= $filters;
 		}
@@ -567,8 +567,8 @@ 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			$this->errors[] = "Error ".$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -3;
 		}
 
@@ -623,7 +623,7 @@ 
 	public function addLine($ref, $value, $position = -1, $notrigger = 0)
 	{
 		global $langs, $user;
-		dol_syslog(__METHOD__ . " id=".$this->id.", ref=".$ref.", value=".$value.", notrigger=".$notrigger);
+		dol_syslog(__METHOD__." id=".$this->id.", ref=".$ref.", value=".$value.", notrigger=".$notrigger);
 		$error = 0;
 
 		// Clean parameters
@@ -635,7 +635,7 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
@@ -684,7 +684,7 @@ 
 	{
 		global $user;
 
-		dol_syslog(__METHOD__ . " lineid=$lineid, ref=$ref, value=$value, notrigger=$notrigger");
+		dol_syslog(__METHOD__." lineid=$lineid, ref=$ref, value=$value, notrigger=$notrigger");
 
 		// Clean parameters
 		$lineid = $lineid > 0 ? $lineid : 0;
@@ -725,7 +725,7 @@ 
 	 */
 	public function deleteLine(User $user, $lineid, $notrigger = 0)
 	{
-		dol_syslog(__METHOD__ . " lineid=$lineid, notrigger=$notrigger");
+		dol_syslog(__METHOD__." lineid=$lineid, notrigger=$notrigger");
 
 		// Clean parameters
 		$lineid = $lineid > 0 ? $lineid : 0;
@@ -772,19 +772,19 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$sql = "SELECT COUNT(*) AS count";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element_line;
-		$sql .= " WHERE " . $this->fk_element . " = " . ((int) $this->id);
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element_line;
+		$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			$this->errors[] = "Error ".$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
@@ -815,21 +815,21 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$sql = "SELECT COUNT(*) AS count";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val AS pac2v";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination AS pac ON pac2v.fk_prod_combination = pac.rowid";
-		$sql .= " WHERE pac2v.fk_prod_attr = " . ((int) $this->id);
-		$sql .= " AND pac.entity IN (" . getEntity('product') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_attribute_combination2val AS pac2v";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination AS pac ON pac2v.fk_prod_combination = pac.rowid";
+		$sql .= " WHERE pac2v.fk_prod_attr = ".((int) $this->id);
+		$sql .= " AND pac.entity IN (".getEntity('product').")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			$this->errors[] = "Error ".$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
@@ -859,16 +859,16 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
-		$sql = "SELECT COUNT(*) AS nb FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val WHERE fk_prod_attr = " . ((int) $this->id);
+		$sql = "SELECT COUNT(*) AS nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val WHERE fk_prod_attr = ".((int) $this->id);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
@@ -892,8 +892,8 @@ 
 	{
 		// Count number of attributes to reorder (according to choice $renum)
 		$nl = 0;
-		$sql = "SELECT count(rowid) FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+		$sql = "SELECT count(rowid) FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE entity IN (".getEntity('product').")";
 		if (!$renum) {
 			$sql .= " AND position = 0";
 		} else {
@@ -913,11 +913,11 @@ 
 			$rows = array();
 
 			// We first search all attributes
-			$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= " WHERE entity IN (" . getEntity('product') . ")";
-			$sql .= " ORDER BY position ASC, rowid " . $rowidorder;
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE entity IN (".getEntity('product').")";
+			$sql .= " ORDER BY position ASC, rowid ".$rowidorder;
 
-			dol_syslog(__METHOD__ . " search all attributes", LOG_DEBUG);
+			dol_syslog(__METHOD__." search all attributes", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$i = 0;
@@ -952,8 +952,8 @@ 
 	{
 		global $hookmanager;
 
-		$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) $position);
-		$sql .= " WHERE rowid = " . ((int) $rowid);
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET position = ".((int) $position);
+		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		if (!$this->db->query($sql)) {
@@ -975,8 +975,8 @@ 
 	 */
 	public function getPositionOfAttribute($rowid)
 	{
-		$sql = "SELECT position FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE rowid=".(int) $rowid." AND entity IN (" . getEntity('product') . ")";
+		$sql = "SELECT position FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE rowid=".(int) $rowid." AND entity IN (".getEntity('product').")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1039,12 +1039,12 @@ 
 	public function updateAttributePositionUp($rowid, $position)
 	{
 		if ($position > 1) {
-			$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) $position);
-			$sql .= " WHERE entity IN (" . getEntity('product') . ")";
-			$sql .= " AND position = " . ((int) ($position - 1));
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET position = ".((int) $position);
+			$sql .= " WHERE entity IN (".getEntity('product').")";
+			$sql .= " AND position = ".((int) ($position - 1));
 			if ($this->db->query($sql)) {
-				$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) ($position - 1));
-				$sql .= " WHERE rowid = " . ((int) $rowid);
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET position = ".((int) ($position - 1));
+				$sql .= " WHERE rowid = ".((int) $rowid);
 				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
 				}
@@ -1065,12 +1065,12 @@ 
 	public function updateAttributePositionDown($rowid, $position, $max)
 	{
 		if ($position < $max) {
-			$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) $position);
-			$sql .= " WHERE entity IN (" . getEntity('product') . ")";
-			$sql .= " AND position = " . ((int) ($position + 1));
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET position = ".((int) $position);
+			$sql .= " WHERE entity IN (".getEntity('product').")";
+			$sql .= " AND position = ".((int) ($position + 1));
 			if ($this->db->query($sql)) {
-				$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) ($position + 1));
-				$sql .= " WHERE rowid = " . ((int) $rowid);
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET position = ".((int) ($position + 1));
+				$sql .= " WHERE rowid = ".((int) $rowid);
 				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
 				}
@@ -1088,8 +1088,8 @@ 
 	public function getMaxAttributesPosition()
 	{
 		// Search the last position of attributes
-		$sql = "SELECT max(position) FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+		$sql = "SELECT max(position) FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE entity IN (".getEntity('product').")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1135,17 +1135,17 @@ 
 
 		$result = '';
 
-		$label = img_picto('', $this->picto) . ' <u>' . $langs->trans("ProductAttribute") . '</u>';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("ProductAttribute").'</u>';
 		if (isset($this->status)) {
-			$label .= ' ' . $this->getLibStatut(5);
+			$label .= ' '.$this->getLibStatut(5);
 		}
 		$label .= '<br>';
-		$label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->label)) {
-			$label .= '<br><b>' . $langs->trans('Label') . ':</b> ' . $this->label;
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
 		}
 
-		$url = dol_buildpath('/variants/card.php', 1) . '?id=' . $this->id;
+		$url = dol_buildpath('/variants/card.php', 1).'?id='.$this->id;
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
@@ -1162,20 +1162,20 @@ 
 		if (empty($notooltip)) {
 			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowProductAttribute");
-				$linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ' title="' . dol_escape_htmltag($label, 1) . '"';
-			$linkclose .= ' class="classfortooltip' . ($morecss ? ' ' . $morecss : '') . '"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 		} else {
-			$linkclose = ($morecss ? ' class="' . $morecss . '"' : '');
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
 
 		if ($option == 'nolink' || empty($url)) {
 			$linkstart = '<span';
 		} else {
-			$linkstart = '<a href="' . $url . '"';
+			$linkstart = '<a href="'.$url.'"';
 		}
-		$linkstart .= $linkclose . '>';
+		$linkstart .= $linkclose.'>';
 		if ($option == 'nolink' || empty($url)) {
 			$linkend = '</span>';
 		} else {
@@ -1186,29 +1186,29 @@ 
 
 		if (empty($this->showphoto_on_popup)) {
 			if ($withpicto) {
-				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
 			}
 		} else {
 			if ($withpicto) {
-				require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 				list($class, $module) = explode('@', $this->picto);
-				$upload_dir = $conf->$module->multidir_output[$conf->entity] . "/$class/" . dol_sanitizeFileName($this->ref);
+				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
 				$filearray = dol_dir_list($upload_dir, "files");
 				$filename = $filearray[0]['name'];
 				if (!empty($filename)) {
 					$pospoint = strpos($filearray[0]['name'], '.');
 
-					$pathtophoto = $class . '/' . $this->ref . '/thumbs/' . substr($filename, 0, $pospoint) . '_mini' . substr($filename, $pospoint);
-					if (!getDolGlobalString(strtoupper($module . '_' . $class) . '_FORMATLISTPHOTOSASUSERS')) {
-						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo' . $module . '" alt="No photo" border="0" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $module . '&entity=' . $conf->entity . '&file=' . urlencode($pathtophoto) . '"></div></div>';
+					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
+					if (!getDolGlobalString(strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS')) {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
 					} else {
-						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $module . '&entity=' . $conf->entity . '&file=' . urlencode($pathtophoto) . '"></div>';
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
 					}
 
 					$result .= '</div>';
 				} else {
-					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
 				}
 			}
 		}
@@ -1332,9 +1332,9 @@ 
 		$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
 		foreach ($dirtpls as $module => $reldir) {
 			if (!empty($module)) {
-				$tpl = dol_buildpath($reldir . '/productattributevalueline_create.tpl.php');
+				$tpl = dol_buildpath($reldir.'/productattributevalueline_create.tpl.php');
 			} else {
-				$tpl = DOL_DOCUMENT_ROOT . $reldir . '/productattributevalueline_create.tpl.php';
+				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/productattributevalueline_create.tpl.php';
 			}
 
 			if (empty($conf->file->strict_mode)) {
@@ -1383,9 +1383,9 @@ 
 			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
 			foreach ($dirtpls as $module => $reldir) {
 				if (!empty($module)) {
-					$tpl = dol_buildpath($reldir . '/productattributevalueline_title.tpl.php');
+					$tpl = dol_buildpath($reldir.'/productattributevalueline_title.tpl.php');
 				} else {
-					$tpl = DOL_DOCUMENT_ROOT . $reldir . '/productattributevalueline_title.tpl.php';
+					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/productattributevalueline_title.tpl.php';
 				}
 				if (empty($conf->file->strict_mode)) {
 					$res = @include $tpl;
@@ -1465,9 +1465,9 @@ 
 			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
 			foreach ($dirtpls as $module => $reldir) {
 				if (!empty($module)) {
-					$tpl = dol_buildpath($reldir . '/productattributevalueline_view.tpl.php');
+					$tpl = dol_buildpath($reldir.'/productattributevalueline_view.tpl.php');
 				} else {
-					$tpl = DOL_DOCUMENT_ROOT . $reldir . '/productattributevalueline_view.tpl.php';
+					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/productattributevalueline_view.tpl.php';
 				}
 
 				if (empty($conf->file->strict_mode)) {
@@ -1489,9 +1489,9 @@ 
 			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
 			foreach ($dirtpls as $module => $reldir) {
 				if (!empty($module)) {
-					$tpl = dol_buildpath($reldir . '/productattributevalueline_edit.tpl.php');
+					$tpl = dol_buildpath($reldir.'/productattributevalueline_edit.tpl.php');
 				} else {
-					$tpl = DOL_DOCUMENT_ROOT . $reldir . '/productattributevalueline_edit.tpl.php';
+					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/productattributevalueline_edit.tpl.php';
 				}
 
 				if (empty($conf->file->strict_mode)) {

htdocs/admin/agenda_other.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $param = GETPOST('param', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
@@ -281,7 +281,7 @@ 
 						$module = new $classname($db, $specimenthirdparty);
 						'@phan-var-force ModeleAction $module';
 						if (method_exists($module, 'info')) {
-							print $module->info($langs);  // @phan-suppress-current-line PhanUndeclaredMethod
+							print $module->info($langs); // @phan-suppress-current-line PhanUndeclaredMethod
 						} else {
 							print $module->description;
 						}

htdocs/admin/agenda_reminder.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $param = GETPOST('param', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');

htdocs/compta/facture/class/facture-rec.class.php

Spacing +26 added lines, -26 removed lines

@@ -571,7 +571,7 @@ 
 		$sql .= " localtax2 = ".((float) $this->total_localtax2).",";
 		$sql .= " total_ht = ".((float) $this->total_ht).",";
 		$sql .= " total_ttc = ".((float) $this->total_ttc).",";
-		$sql .= " fk_societe_rib = ".(!empty($this->fk_societe_rib) ? ((int) $this->fk_societe_rib) : 'NULL');;
+		$sql .= " fk_societe_rib = ".(!empty($this->fk_societe_rib) ? ((int) $this->fk_societe_rib) : 'NULL'); ;
 		// TODO Add missing fields
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
@@ -658,7 +658,7 @@ 
 				$this->titre                  = $obj->title; // deprecated
 				$this->title                  = $obj->title;
 				$this->ref                    = $obj->title;
-				$this->subtype				  = $obj->subtype;
+				$this->subtype = $obj->subtype;
 				$this->suspended              = $obj->suspended;
 				$this->total_ht               = $obj->total_ht;
 				$this->total_tva              = $obj->total_tva;
@@ -679,7 +679,7 @@ 
 				$this->fk_societe_rib         = $obj->fk_societe_rib;
 				$this->note_private           = $obj->note_private;
 				$this->note_public            = $obj->note_public;
-				$this->user_author            = $obj->fk_user_author;	// deprecated
+				$this->user_author            = $obj->fk_user_author; // deprecated
 				$this->user_creation_id       = $obj->fk_user_author;
 				$this->model_pdf              = $obj->model_pdf;
 				//$this->special_code = $obj->special_code;
@@ -778,35 +778,35 @@ 
 				$objp = $this->db->fetch_object($result);
 				$line = new FactureLigneRec($this->db);
 
-				$line->id				= $objp->rowid;
+				$line->id = $objp->rowid;
 				$line->rowid			= $objp->rowid;
-				$line->fk_facture		= $objp->fk_facture;
-				$line->fk_parent_line	= $objp->fk_parent_line;
+				$line->fk_facture = $objp->fk_facture;
+				$line->fk_parent_line = $objp->fk_parent_line;
 				$line->desc				= $objp->description; // Description line
 				$line->description		= $objp->description; // Description line
-				$line->ref				= $objp->product_ref; // Ref product
+				$line->ref = $objp->product_ref; // Ref product
 				$line->product_ref		= $objp->product_ref; // Ref product
-				$line->libelle			= $objp->product_label; // deprecated
+				$line->libelle = $objp->product_label; // deprecated
 				$line->product_label	= $objp->product_label; // Label product
 				$line->product_desc		= $objp->product_desc; // Description product
 				$line->product_type		= $objp->product_type; // Type of line
-				$line->fk_product_type	= $objp->fk_product_type; // Type of product
+				$line->fk_product_type = $objp->fk_product_type; // Type of product
 				$line->qty 				= $objp->qty;
-				$line->subprice			= $objp->subprice;
+				$line->subprice = $objp->subprice;
 
 				$line->label			= $objp->custom_label; // @deprecated
 
 				$line->vat_src_code		= $objp->vat_src_code;
-				$line->tva_tx			= $objp->tva_tx;
+				$line->tva_tx = $objp->tva_tx;
 				$line->localtax1_tx		= $objp->localtax1_tx;
 				$line->localtax2_tx		= $objp->localtax2_tx;
 				$line->localtax1_type	= $objp->localtax1_type;
 				$line->localtax2_type	= $objp->localtax2_type;
 				$line->remise_percent	= $objp->remise_percent;
 				//$line->fk_remise_except = $objp->fk_remise_except;
-				$line->fk_product		= $objp->fk_product;
-				$line->date_start_fill	= $objp->date_start_fill;
-				$line->date_end_fill	= $objp->date_end_fill;
+				$line->fk_product = $objp->fk_product;
+				$line->date_start_fill = $objp->date_start_fill;
+				$line->date_end_fill = $objp->date_end_fill;
 				$line->info_bits		= $objp->info_bits;
 				$line->total_ht			= $objp->total_ht;
 				$line->total_tva		= $objp->total_tva;
@@ -822,13 +822,13 @@ 
 				$line->marge_tx			= (string) $marginInfos[1];
 				$line->marque_tx		= (string) $marginInfos[2];
 				$line->rang				= $objp->rang;
-				$line->special_code		= $objp->special_code;
-				$line->fk_unit			= $objp->fk_unit;
-				$line->fk_contract_line	= $objp->fk_contract_line;
+				$line->special_code = $objp->special_code;
+				$line->fk_unit = $objp->fk_unit;
+				$line->fk_contract_line = $objp->fk_contract_line;
 
 				// Ne plus utiliser
-				$line->price			= $objp->price;
-				$line->remise			= $objp->remise;
+				$line->price = $objp->price;
+				$line->remise = $objp->remise;
 
 				$line->fetch_optionals();
 
@@ -1421,7 +1421,7 @@ 
 
 					$facture->type = self::TYPE_STANDARD;
 					$facture->subtype = $facturerec->subtype;
-					$facture->statut = self::STATUS_DRAFT;	// deprecated
+					$facture->statut = self::STATUS_DRAFT; // deprecated
 					$facture->status = self::STATUS_DRAFT;
 					$facture->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.
 					$facture->socid = $facturerec->socid;
@@ -1572,7 +1572,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) {
@@ -1831,7 +1831,7 @@ 
 
 		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);
@@ -2023,7 +2023,7 @@ 
 					$resSuspend = $this->setValueFrom('suspended', 1);
 
 					if ($resSuspend <= 0) {
-						dol_syslog(__METHOD__ . '::setValueFrom Error : ' . $this->error, LOG_ERR);
+						dol_syslog(__METHOD__.'::setValueFrom Error : '.$this->error, LOG_ERR);
 						return -1;
 					}
 				}
@@ -2363,9 +2363,9 @@ 
 		if ($result) {
 			$objp = $this->db->fetch_object($result);
 
-			$this->id				= $objp->rowid;
-			$this->fk_facture		= $objp->fk_facture;
-			$this->fk_parent_line	= $objp->fk_parent_line;
+			$this->id = $objp->rowid;
+			$this->fk_facture = $objp->fk_facture;
+			$this->fk_parent_line = $objp->fk_parent_line;
 			$this->label            = $objp->custom_label; // Label line
 			$this->desc             = $objp->description; // Description line
 			$this->description      = $objp->description; // Description line

htdocs/accountancy/class/lettering.class.php

Spacing +74 added lines, -74 removed lines

@@ -311,12 +311,12 @@ 
 
 		// Check partial / normal lettering case
 		$sql = "SELECT ab.lettering_code, GROUP_CONCAT(DISTINCT ab.rowid SEPARATOR ',') AS bookkeeping_ids";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab";
-		$sql .= " WHERE ab.rowid IN (" . $this->db->sanitize(implode(',', $ids)) . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS ab";
+		$sql .= " WHERE ab.rowid IN (".$this->db->sanitize(implode(',', $ids)).")";
 		$sql .= " GROUP BY ab.lettering_code";
 		$sql .= " ORDER BY ab.lettering_code DESC";
 
-		dol_syslog(__METHOD__ . " - Check partial / normal lettering case", LOG_DEBUG);
+		dol_syslog(__METHOD__." - Check partial / normal lettering case", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
@@ -331,16 +331,16 @@ 
 					}
 				} elseif (!$partial && preg_match('/^[a-z]+$/', $obj->lettering_code)) {
 					// Delete partial lettering code if set normal lettering
-					$sql2 = "UPDATE " . MAIN_DB_PREFIX . "accounting_bookkeeping SET";
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping SET";
 					$sql2 .= " lettering_code = NULL";
 					$sql2 .= ", date_lettering = NULL";
-					$sql2 .= " WHERE entity IN (" . getEntity('accountancy') . ")";
-					$sql2 .= " AND lettering_code = '" . $this->db->escape($obj->lettering_code) . "'";
+					$sql2 .= " WHERE entity IN (".getEntity('accountancy').")";
+					$sql2 .= " AND lettering_code = '".$this->db->escape($obj->lettering_code)."'";
 
-					dol_syslog(__METHOD__ . " - Remove partial lettering", LOG_DEBUG);
+					dol_syslog(__METHOD__." - Remove partial lettering", LOG_DEBUG);
 					$resql2 = $this->db->query($sql2);
 					if (!$resql2) {
-						$this->errors[] = 'Error' . $this->db->lasterror();
+						$this->errors[] = 'Error'.$this->db->lasterror();
 						$error++;
 						break;
 					}
@@ -348,20 +348,20 @@ 
 			}
 			$this->db->free($resql);
 		} else {
-			$this->errors[] = 'Error' . $this->db->lasterror();
+			$this->errors[] = 'Error'.$this->db->lasterror();
 			$error++;
 		}
 
 		if (!$error && !empty($ids)) {
 			// Get next code
 			$sql = "SELECT DISTINCT ab2.lettering_code";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab";
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab2 ON ab2.subledger_account = ab.subledger_account";
-			$sql .= " WHERE ab.rowid IN (" . $this->db->sanitize(implode(',', $ids)) . ")";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS ab";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_bookkeeping AS ab2 ON ab2.subledger_account = ab.subledger_account";
+			$sql .= " WHERE ab.rowid IN (".$this->db->sanitize(implode(',', $ids)).")";
 			$sql .= " AND ab2.lettering_code != ''";
 			$sql .= " ORDER BY ab2.lettering_code DESC";
 
-			dol_syslog(__METHOD__ . " - Get next code", LOG_DEBUG);
+			dol_syslog(__METHOD__." - Get next code", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				while ($obj = $this->db->fetch_object($resql)) {
@@ -376,43 +376,43 @@ 
 				}
 				$this->db->free($resql);
 			} else {
-				$this->errors[] = 'Error' . $this->db->lasterror();
+				$this->errors[] = 'Error'.$this->db->lasterror();
 				$error++;
 			}
 
 			// Test amount integrity
 			if (!$error && !$partial) {
-				$sql = "SELECT SUM(ABS(debit)) as deb, SUM(ABS(credit)) as cred FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE ";
-				$sql .= " rowid IN (" . $this->db->sanitize(implode(',', $ids)) . ") AND lettering_code IS NULL AND subledger_account != ''";
+				$sql = "SELECT SUM(ABS(debit)) as deb, SUM(ABS(credit)) as cred FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE ";
+				$sql .= " rowid IN (".$this->db->sanitize(implode(',', $ids)).") AND lettering_code IS NULL AND subledger_account != ''";
 
-				dol_syslog(__METHOD__ . " - Test amount integrity", LOG_DEBUG);
+				dol_syslog(__METHOD__." - Test amount integrity", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					if ($obj = $this->db->fetch_object($resql)) {
 						if (!(round(abs($obj->deb), 2) === round(abs($obj->cred), 2))) {
-							$this->errors[] = 'Total not exacts ' . round(abs($obj->deb), 2) . ' vs ' . round(abs($obj->cred), 2);
+							$this->errors[] = 'Total not exacts '.round(abs($obj->deb), 2).' vs '.round(abs($obj->cred), 2);
 							$error++;
 						}
 					}
 					$this->db->free($resql);
 				} else {
-					$this->errors[] = 'Erreur sql' . $this->db->lasterror();
+					$this->errors[] = 'Erreur sql'.$this->db->lasterror();
 					$error++;
 				}
 			}
 
 			// Update lettering code
 			if (!$error) {
-				$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_bookkeeping SET";
-				$sql .= " lettering_code='" . $this->db->escape($letter) . "'";
-				$sql .= ", date_lettering = '" . $this->db->idate($now) . "'"; // todo correct date it's false
-				$sql .= "  WHERE rowid IN (" . $this->db->sanitize(implode(',', $ids)) . ") AND lettering_code IS NULL AND subledger_account != ''";
+				$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping SET";
+				$sql .= " lettering_code='".$this->db->escape($letter)."'";
+				$sql .= ", date_lettering = '".$this->db->idate($now)."'"; // todo correct date it's false
+				$sql .= "  WHERE rowid IN (".$this->db->sanitize(implode(',', $ids)).") AND lettering_code IS NULL AND subledger_account != ''";
 
-				dol_syslog(__METHOD__ . " - Update lettering code", LOG_DEBUG);
+				dol_syslog(__METHOD__." - Update lettering code", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++;
-					$this->errors[] = "Error " . $this->db->lasterror();
+					$this->errors[] = "Error ".$this->db->lasterror();
 				} else {
 					$affected_rows = $this->db->affected_rows($resql);
 				}
@@ -423,8 +423,8 @@ 
 		if ($error) {
 			$this->db->rollback();
 			foreach ($this->errors as $errmsg) {
-				dol_syslog(get_class($this) . "::update " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			return -1 * $error;
 		} else {
@@ -477,7 +477,7 @@ 
 	 */
 	public function bookkeepingLetteringAll($bookkeeping_ids, $unlettering = false)
 	{
-		dol_syslog(__METHOD__ . " - ", LOG_DEBUG);
+		dol_syslog(__METHOD__." - ", LOG_DEBUG);
 
 		$error = 0;
 		$errors = array();
@@ -603,16 +603,16 @@ 
 
 		// Get all bookkeeping lines
 		$sql = "SELECT DISTINCT ab.doc_type, ab.fk_doc";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab";
-		$sql .= " WHERE ab.entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS ab";
+		$sql .= " WHERE ab.entity IN (".getEntity('accountancy').")";
 		$sql .= " AND ab.fk_doc > 0";
 		if (!empty($bookkeeping_ids)) {
 			// Get all bookkeeping lines of piece number
 			$sql .= " AND EXISTS (";
 			$sql .= "  SELECT rowid";
-			$sql .= "  FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS pn";
-			$sql .= "  WHERE pn.entity IN (" . getEntity('accountancy') . ")";
-			$sql .= "  AND pn.rowid IN (" . $this->db->sanitize(implode(',', $bookkeeping_ids)) . ")";
+			$sql .= "  FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS pn";
+			$sql .= "  WHERE pn.entity IN (".getEntity('accountancy').")";
+			$sql .= "  AND pn.rowid IN (".$this->db->sanitize(implode(',', $bookkeeping_ids)).")";
 			$sql .= "  AND pn.piece_num = ab.piece_num";
 			$sql .= " )";
 		}
@@ -620,10 +620,10 @@ 
 			$sql .= " AND ab.subledger_account != ''";
 		}
 
-		dol_syslog(__METHOD__ . " - Get all bookkeeping lines", LOG_DEBUG);
+		dol_syslog(__METHOD__." - Get all bookkeeping lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
@@ -670,25 +670,25 @@ 
 
 				// Get all bookkeeping lines linked
 				$sql = "SELECT DISTINCT ab.rowid, ab.piece_num, ab.debit, ab.credit, ab.lettering_code";
-				$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab";
-				$sql .= " WHERE ab.entity IN (" . getEntity('accountancy') . ")";
+				$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS ab";
+				$sql .= " WHERE ab.entity IN (".getEntity('accountancy').")";
 				$sql .= " AND (";
 				if (!empty($bank_ids)) {
 					$sql .= " EXISTS (";
 					$sql .= "  SELECT bpn.rowid";
-					$sql .= "  FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS bpn";
-					$sql .= "  WHERE bpn.entity IN (" . getEntity('accountancy') . ")";
+					$sql .= "  FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS bpn";
+					$sql .= "  WHERE bpn.entity IN (".getEntity('accountancy').")";
 					$sql .= "  AND bpn.doc_type = 'bank'";
-					$sql .= "  AND bpn.fk_doc IN (" . $this->db->sanitize(implode(',', $bank_ids)) . ")";
+					$sql .= "  AND bpn.fk_doc IN (".$this->db->sanitize(implode(',', $bank_ids)).")";
 					$sql .= "  AND bpn.piece_num = ab.piece_num";
 					$sql .= " ) OR ";
 				}
 				$sql .= " EXISTS (";
 				$sql .= "  SELECT dpn.rowid";
-				$sql .= "  FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS dpn";
-				$sql .= "  WHERE dpn.entity IN (" . getEntity('accountancy') . ")";
-				$sql .= "  AND dpn.doc_type = '" . $this->db->escape($doc_type) . "'";
-				$sql .= "  AND dpn.fk_doc IN (" . $this->db->sanitize(implode(',', $doc_ids)) . ")";
+				$sql .= "  FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS dpn";
+				$sql .= "  WHERE dpn.entity IN (".getEntity('accountancy').")";
+				$sql .= "  AND dpn.doc_type = '".$this->db->escape($doc_type)."'";
+				$sql .= "  AND dpn.fk_doc IN (".$this->db->sanitize(implode(',', $doc_ids)).")";
 				$sql .= "  AND dpn.piece_num = ab.piece_num";
 				$sql .= " )";
 				$sql .= ")";
@@ -696,10 +696,10 @@ 
 					$sql .= " AND ab.subledger_account != ''";
 				}
 
-				dol_syslog(__METHOD__ . " - Get all bookkeeping lines linked", LOG_DEBUG);
+				dol_syslog(__METHOD__." - Get all bookkeeping lines linked", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->errors[] = "Error " . $this->db->lasterror();
+					$this->errors[] = "Error ".$this->db->lasterror();
 					return -1;
 				}
 
@@ -732,7 +732,7 @@ 
 	 */
 	public function getDocTypeAndFkDocFromBankLines($bank_ids)
 	{
-		dol_syslog(__METHOD__ . " - bank_ids=".json_encode($bank_ids), LOG_DEBUG);
+		dol_syslog(__METHOD__." - bank_ids=".json_encode($bank_ids), LOG_DEBUG);
 
 		// Clean parameters
 		$bank_ids = is_array($bank_ids) ? $bank_ids : array();
@@ -744,16 +744,16 @@ 
 		$bookkeeping_lines_by_type = array();
 		foreach (self::$doc_type_infos as $doc_type => $doc_type_info) {
 			// Get all fk_doc by doc_type from bank ids
-			$sql = "SELECT DISTINCT dp." . $this->db->sanitize($doc_type_info['doc_payment_table_fk_doc']) . " AS fk_doc";
-			$sql .= " FROM " . MAIN_DB_PREFIX . $this->db->sanitize($doc_type_info['payment_table']) . " AS p";
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $this->db->sanitize($doc_type_info['doc_payment_table']) . " AS dp ON dp." . $this->db->sanitize($doc_type_info['doc_payment_table_fk_payment']) . " = p.rowid";
-			$sql .= " WHERE p." . $this->db->sanitize($doc_type_info['payment_table_fk_bank']) . " IN (" . $this->db->sanitize(implode(',', $bank_ids)) . ")";
-			$sql .= " AND dp." . $this->db->sanitize($doc_type_info['doc_payment_table_fk_doc']) . " > 0";
+			$sql = "SELECT DISTINCT dp.".$this->db->sanitize($doc_type_info['doc_payment_table_fk_doc'])." AS fk_doc";
+			$sql .= " FROM ".MAIN_DB_PREFIX.$this->db->sanitize($doc_type_info['payment_table'])." AS p";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$this->db->sanitize($doc_type_info['doc_payment_table'])." AS dp ON dp.".$this->db->sanitize($doc_type_info['doc_payment_table_fk_payment'])." = p.rowid";
+			$sql .= " WHERE p.".$this->db->sanitize($doc_type_info['payment_table_fk_bank'])." IN (".$this->db->sanitize(implode(',', $bank_ids)).")";
+			$sql .= " AND dp.".$this->db->sanitize($doc_type_info['doc_payment_table_fk_doc'])." > 0";
 
-			dol_syslog(__METHOD__ . " - Get all fk_doc by doc_type from list of bank ids for '" . $doc_type . "'", LOG_DEBUG);
+			dol_syslog(__METHOD__." - Get all fk_doc by doc_type from list of bank ids for '".$doc_type."'", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$this->errors[] = "Error " . $this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
 				return -1;
 			}
 
@@ -777,7 +777,7 @@ 
 	{
 		global $langs;
 
-		dol_syslog(__METHOD__ . " - bank_ids=".json_encode($document_ids) . ", doc_type=$doc_type", LOG_DEBUG);
+		dol_syslog(__METHOD__." - bank_ids=".json_encode($document_ids).", doc_type=$doc_type", LOG_DEBUG);
 
 		// Clean parameters
 		$document_ids = is_array($document_ids) ? $document_ids : array();
@@ -799,17 +799,17 @@ 
 		$bank_ids = array();
 
 		// Get all fk_doc by doc_type from bank ids
-		$sql = "SELECT DISTINCT p." . $this->db->sanitize($doc_type_info['payment_table_fk_bank']) . " AS fk_doc";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->db->sanitize($doc_type_info['payment_table']) . " AS p";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $this->db->sanitize($doc_type_info['doc_payment_table']) . " AS dp ON dp." . $this->db->sanitize($doc_type_info['doc_payment_table_fk_payment']) . " = p.rowid";
+		$sql = "SELECT DISTINCT p.".$this->db->sanitize($doc_type_info['payment_table_fk_bank'])." AS fk_doc";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->db->sanitize($doc_type_info['payment_table'])." AS p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$this->db->sanitize($doc_type_info['doc_payment_table'])." AS dp ON dp.".$this->db->sanitize($doc_type_info['doc_payment_table_fk_payment'])." = p.rowid";
 		// Implode used on array of int @phan-suppress-next-line PhanTypeMismatchArgumentInternal
-		$sql .= " WHERE dp." . $this->db->sanitize($doc_type_info['doc_payment_table_fk_doc']) . " IN (" . $this->db->sanitize(implode(',', $document_ids)) . ")";
-		$sql .= " AND p." . $this->db->sanitize($doc_type_info['payment_table_fk_bank']) . " > 0";
+		$sql .= " WHERE dp.".$this->db->sanitize($doc_type_info['doc_payment_table_fk_doc'])." IN (".$this->db->sanitize(implode(',', $document_ids)).")";
+		$sql .= " AND p.".$this->db->sanitize($doc_type_info['payment_table_fk_bank'])." > 0";
 
-		dol_syslog(__METHOD__ . " - Get all bank ids from list of document ids of a type '" . $doc_type . "'", LOG_DEBUG);
+		dol_syslog(__METHOD__." - Get all bank ids from list of document ids of a type '".$doc_type."'", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
@@ -864,26 +864,26 @@ 
 				$sql = "SELECT DISTINCT tl2.fk_link, tl2.fk_doc";
 				$sql .= " FROM (";
 				// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset
-				$sql .= "   SELECT DISTINCT " . $this->db->ifsql("tll.".$this->db->sanitize($linked_info['fk_table_link_line_parent'])." IS NOT NULL", "tll.".$this->db->sanitize($linked_info['fk_table_link_line_parent']), "tl.".$this->db->sanitize($linked_info['fk_link']))." AS fk_link, tl.".$this->db->sanitize($linked_info['fk_doc'])." AS fk_doc";
-				$sql .= "   FROM " . MAIN_DB_PREFIX .$this->db->sanitize($linked_info['table'])." AS tl";
+				$sql .= "   SELECT DISTINCT ".$this->db->ifsql("tll.".$this->db->sanitize($linked_info['fk_table_link_line_parent'])." IS NOT NULL", "tll.".$this->db->sanitize($linked_info['fk_table_link_line_parent']), "tl.".$this->db->sanitize($linked_info['fk_link']))." AS fk_link, tl.".$this->db->sanitize($linked_info['fk_doc'])." AS fk_doc";
+				$sql .= "   FROM ".MAIN_DB_PREFIX.$this->db->sanitize($linked_info['table'])." AS tl";
 				// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset
-				$sql .= "   LEFT JOIN " . MAIN_DB_PREFIX . $this->db->sanitize($linked_info['table_link_line']) . " AS tll ON tll.".$this->db->sanitize($linked_info['fk_table_link_line']) . " = tl.".$this->db->sanitize($linked_info['fk_line_link']);
+				$sql .= "   LEFT JOIN ".MAIN_DB_PREFIX.$this->db->sanitize($linked_info['table_link_line'])." AS tll ON tll.".$this->db->sanitize($linked_info['fk_table_link_line'])." = tl.".$this->db->sanitize($linked_info['fk_line_link']);
 				$sql .= ") AS tl";
 				$sql .= " LEFT JOIN (";
 				// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset
-				$sql .= "   SELECT DISTINCT " . $this->db->ifsql("tll.".$this->db->sanitize($linked_info['fk_table_link_line_parent'])." IS NOT NULL", "tll.".$this->db->sanitize($linked_info['fk_table_link_line_parent']), "tl.".$this->db->sanitize($linked_info['fk_link']))." AS fk_link, tl.".$this->db->sanitize($linked_info['fk_doc'])." AS fk_doc";
-				$sql .= "   FROM " . MAIN_DB_PREFIX .$this->db->sanitize($linked_info['table'])." AS tl";
+				$sql .= "   SELECT DISTINCT ".$this->db->ifsql("tll.".$this->db->sanitize($linked_info['fk_table_link_line_parent'])." IS NOT NULL", "tll.".$this->db->sanitize($linked_info['fk_table_link_line_parent']), "tl.".$this->db->sanitize($linked_info['fk_link']))." AS fk_link, tl.".$this->db->sanitize($linked_info['fk_doc'])." AS fk_doc";
+				$sql .= "   FROM ".MAIN_DB_PREFIX.$this->db->sanitize($linked_info['table'])." AS tl";
 				// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset
-				$sql .= "   LEFT JOIN " . MAIN_DB_PREFIX . $this->db->sanitize($linked_info['table_link_line']) . " AS tll ON tll.".$this->db->sanitize($linked_info['fk_table_link_line']) . " = tl.".$this->db->sanitize($linked_info['fk_line_link']);
+				$sql .= "   LEFT JOIN ".MAIN_DB_PREFIX.$this->db->sanitize($linked_info['table_link_line'])." AS tll ON tll.".$this->db->sanitize($linked_info['fk_table_link_line'])." = tl.".$this->db->sanitize($linked_info['fk_line_link']);
 				$sql .= ") AS tl2 ON tl2.fk_link = tl.fk_link";
-				$sql .= " WHERE tl.fk_doc IN (" . $this->db->sanitize(implode(',', $document_ids)) . ")";
+				$sql .= " WHERE tl.fk_doc IN (".$this->db->sanitize(implode(',', $document_ids)).")";
 				$sql .= " AND tl2.fk_doc IS NOT NULL";
 			}
 
-			dol_syslog(__METHOD__ . " - Get document lines", LOG_DEBUG);
+			dol_syslog(__METHOD__." - Get document lines", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$this->errors[] = "Error " . $this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
 				return -1;
 			}
 
@@ -891,7 +891,7 @@ 
 			while ($obj = $this->db->fetch_object($resql)) {
 				$current_document_ids[$obj->fk_doc] = $obj->fk_doc;
 
-				$link_key = $linked_info['prefix'] . $obj->fk_link;
+				$link_key = $linked_info['prefix'].$obj->fk_link;
 				$element_by_link[$link_key][$obj->fk_doc] = $obj->fk_doc;
 				$link_by_element[$obj->fk_doc][$link_key] = $link_key;
 				if ($is_fk_link_is_also_fk_doc) {
@@ -967,8 +967,8 @@ 
 
 		if (empty($link_key)) {
 			// Restore list when is the begin of recursive function
-			$link_by_element = $save_link_by_element;  // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
-			$element_by_link = $save_element_by_link;  // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
+			$link_by_element = $save_link_by_element; // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
+			$element_by_link = $save_element_by_link; // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
 		}
 
 		return $grouped_elements;

htdocs/accountancy/class/bookkeeping.class.php

Spacing +97 added lines, -97 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++;
@@ -1580,7 +1580,7 @@ 
 		$this->db->begin();
 
 		// Call triggers
-		if (! $error && ! $notrigger) {
+		if (!$error && !$notrigger) {
 			$result = $this->call_trigger('BOOKKEEPING_DELETE', $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;
@@ -1730,8 +1730,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);
@@ -1859,7 +1859,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);
@@ -1900,7 +1900,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);
 
@@ -1944,7 +1944,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);
@@ -2009,7 +2009,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);
 
@@ -2087,7 +2087,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++;
@@ -2105,7 +2105,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) {
@@ -2116,7 +2116,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++;
@@ -2126,7 +2126,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++;
@@ -2144,7 +2144,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) {
@@ -2155,7 +2155,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) {
@@ -2212,7 +2212,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);
@@ -2276,7 +2276,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);
@@ -2316,7 +2316,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);
@@ -2349,7 +2349,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');
@@ -2362,10 +2362,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++;
@@ -2454,17 +2454,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;
@@ -2534,8 +2534,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);
@@ -2557,8 +2557,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);
@@ -2593,10 +2593,10 @@ 
 		$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);
 		if (!empty($filter)) {
-			$sql .= " AND (" . $this->db->sanitize($filter, 1, 1, 1) . ')';
+			$sql .= " AND (".$this->db->sanitize($filter, 1, 1, 1).')';
 		}
 		$sql .= $this->db->order('date_start', 'ASC');
 
@@ -2636,13 +2636,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")) {
@@ -2650,7 +2650,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)";
@@ -2671,7 +2671,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;
@@ -2699,11 +2699,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);
@@ -2736,27 +2736,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;
@@ -2795,7 +2795,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;
 		}
 
@@ -2814,7 +2814,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;
 		}
 
@@ -2834,7 +2834,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++;
 			}
 
@@ -2848,7 +2848,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 {
@@ -2862,7 +2862,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';
@@ -2872,14 +2872,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, '')";
@@ -2889,8 +2889,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 {
@@ -2919,14 +2919,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__ . ' ' . join(',', $this->errors), LOG_ERR);
+									$this->errors[] = 'Error: '.$this->db->lasterror();
+									dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 									$error++;
 								}
 								$objtmp = $this->db->fetch_object($result);
@@ -2983,14 +2983,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__ . ' ' . join(',', $this->errors), LOG_ERR);
+								$this->errors[] = 'Error: '.$this->db->lasterror();
+								dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 								$error++;
 							}
 							$objtmp = $this->db->fetch_object($result);
@@ -3063,7 +3063,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;
 		}
 
@@ -3082,7 +3082,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;
 		}
 
@@ -3102,7 +3102,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;
 		}
 
@@ -3110,18 +3110,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 {
@@ -3136,7 +3136,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;
 				}