Dolibarr / dolibarr

htdocs/variants/class/ProductAttributeValue.class.php

Spacing +35 added lines, -35 removed lines

@@ -78,7 +78,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'fk_product_attribute' => array('type'=>'integer:ProductAttribute:variants/class/ProductAttribute.class.php', 'label'=>'ProductAttribute', 'enabled'=>1, 'visible'=>0, 'position'=>10, 'notnull'=>1, 'index'=>1,),
 		'ref' => array('type'=>'varchar(255)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>''),
@@ -160,32 +160,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 .= " fk_product_attribute, ref, value, entity, position";
 		$sql .= ")";
 		$sql .= " VALUES (";
-		$sql .= "  " . ((int) $this->fk_product_attribute);
-		$sql .= ", '" . $this->db->escape($this->ref) . "'";
-		$sql .= ", '" . $this->db->escape($this->value) . "'";
-		$sql .= ", " . ((int) $this->entity);
-		$sql .= ", " . ((int) $this->position);
+		$sql .= "  ".((int) $this->fk_product_attribute);
+		$sql .= ", '".$this->db->escape($this->ref)."'";
+		$sql .= ", '".$this->db->escape($this->value)."'";
+		$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);
 		}
 
 		if (!$error && !$notrigger) {
@@ -226,20 +226,20 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$sql = "SELECT rowid, fk_product_attribute, ref, value";
-		$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;
 		}
 
@@ -274,15 +274,15 @@ 
 			$sql .= "DISTINCT ";
 		}
 
-		$sql .= "v.fk_product_attribute, v.rowid, v.ref, v.value FROM " . MAIN_DB_PREFIX . "product_attribute_value v ";
+		$sql .= "v.fk_product_attribute, v.rowid, v.ref, v.value FROM ".MAIN_DB_PREFIX."product_attribute_value v ";
 
 		if ($only_used) {
-			$sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination2val c2v ON c2v.fk_prod_attr_val = v.rowid ";
-			$sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination c ON c.rowid = c2v.fk_prod_combination ";
-			$sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product p ON p.rowid = c.fk_product_child ";
+			$sql .= "LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c2v.fk_prod_attr_val = v.rowid ";
+			$sql .= "LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination c ON c.rowid = c2v.fk_prod_combination ";
+			$sql .= "LEFT JOIN ".MAIN_DB_PREFIX."product p ON p.rowid = c.fk_product_child ";
 		}
 
-		$sql .= "WHERE v.fk_product_attribute = " . ((int) $prodattr_id);
+		$sql .= "WHERE v.fk_product_attribute = ".((int) $prodattr_id);
 
 		if ($only_used) {
 			$sql .= " AND c2v.rowid IS NOT NULL AND p.tosell = 1";
@@ -334,25 +334,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 .= "  fk_product_attribute = " . ((int) $this->fk_product_attribute);
-		$sql .= ", ref = '" . $this->db->escape($this->ref) . "'";
-		$sql .= ", value = '" . $this->db->escape($this->value) . "'";
-		$sql .= ", position = " . ((int) $this->position);
+		$sql .= "  fk_product_attribute = ".((int) $this->fk_product_attribute);
+		$sql .= ", ref = '".$this->db->escape($this->ref)."'";
+		$sql .= ", value = '".$this->db->escape($this->value)."'";
+		$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++;
 		}
 
@@ -395,7 +395,7 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
@@ -419,12 +419,12 @@ 
 		}
 
 		if (!$error) {
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element . " WHERE rowid = " . ((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element." 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++;
 			}
 		}
@@ -457,16 +457,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_val = " . ((int) $this->id);
+		$sql = "SELECT COUNT(*) AS nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val WHERE fk_prod_attr_val = ".((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;
 		}
 

htdocs/compta/stats/casoc.php

Braces +3 added lines, -1 removed lines

@@ -57,7 +57,9 @@
 
 // Category
 $selected_cat = (int) GETPOST('search_categ', 'int');
-if ($selected_cat == -1) $selected_cat = '';
+if ($selected_cat == -1) {
+	$selected_cat = '';
+}
 $subcat = false;
 if (GETPOST('subcat', 'alpha') === 'yes') {
 	$subcat = true;

Spacing +5 added lines, -5 removed lines

@@ -99,8 +99,8 @@ 
 	$month_current = dol_print_date(dol_now(), '%m');
 	$year_start = $year;
 }
-$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver');	// We use timezone of server so report is same from everywhere
-$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
+$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
+$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
 // Quarter
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q", "int") ?GETPOST("q", "int") : 0;
@@ -179,7 +179,7 @@ 
 $headerparams = array_merge($commonparams, $headerparams);
 $tableparams = array_merge($commonparams, $tableparams);
 
-$paramslink="";
+$paramslink = "";
 foreach ($allparams as $key => $value) {
 	$paramslink .= '&'.$key.'='.$value;
 }
@@ -203,8 +203,8 @@ 
 	$modecompta = "RECETTES-DEPENSES";
 }
 
-$exportlink="";
-$namelink="";
+$exportlink = "";
+$namelink = "";
 
 // Show report header
 if ($modecompta == "CREANCES-DETTES") {

htdocs/core/class/commonstickergenerator.class.php

Spacing +1 added lines, -1 removed lines

@@ -289,7 +289,7 @@
 		// phpcs:enable
 		$this->_Metric = $format['metric'];
 		$this->_Avery_Name = $format['name'];
-		$this->_Avery_Code = empty($format['code'])?'':$format['code'];
+		$this->_Avery_Code = empty($format['code']) ? '' : $format['code'];
 		$this->_Margin_Left = $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
 		$this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
 		$this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);

htdocs/compta/facture/class/facture.class.php

Braces +3 added lines, -1 removed lines

@@ -813,7 +813,9 @@
 
 						// Complete vat rate with code
 						$vatrate = $newinvoiceline->tva_tx;
-						if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$newinvoiceline->vat_src_code.')';
+						if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) {
+							$vatrate.=' ('.$newinvoiceline->vat_src_code.')';
+						}
 
 						$newinvoiceline->fk_parent_line = $fk_parent_line;
 

Spacing +38 added lines, -38 removed lines

@@ -461,7 +461,7 @@ 
 			$this->mode_reglement_id = 0;
 		}
 		$this->status = self::STATUS_DRAFT;
-		$this->statut = self::STATUS_DRAFT;	// deprecated
+		$this->statut = self::STATUS_DRAFT; // deprecated
 
 		if (!empty($this->multicurrency_code)) {
 			// Multicurrency (test on $this->multicurrency_tx because we should take the default rate of multicurrency_code only if not using original rate)
@@ -562,7 +562,7 @@ 
 				$this->mode_reglement_id = 0;
 			}
 			$this->status = self::STATUS_DRAFT;
-			$this->statut = self::STATUS_DRAFT;	// deprecated
+			$this->statut = self::STATUS_DRAFT; // deprecated
 
 			$this->linked_objects = $_facrec->linkedObjectsIds;
 			// We do not add link to template invoice or next invoice will be linked to all generated invoices
@@ -807,7 +807,7 @@ 
 
 						// Complete vat rate with code
 						$vatrate = $newinvoiceline->tva_tx;
-						if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$newinvoiceline->vat_src_code.')';
+						if ($newinvoiceline->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) $vatrate .= ' ('.$newinvoiceline->vat_src_code.')';
 
 						$newinvoiceline->fk_parent_line = $fk_parent_line;
 
@@ -1037,7 +1037,7 @@ 
 						$buyprice,
 						$_facrec->lines[$i]->label,
 						empty($_facrec->lines[$i]->array_options) ?null:$_facrec->lines[$i]->array_options,
-						100,	// situation percent is undefined on recurring invoice lines
+						100, // situation percent is undefined on recurring invoice lines
 						'',
 						$_facrec->lines[$i]->fk_unit,
 						$_facrec->lines[$i]->multicurrency_subprice,
@@ -1133,7 +1133,7 @@ 
 
 		$facture->fk_facture_source = $this->fk_facture_source;
 		$facture->type 			    = $this->type;
-		$facture->subtype 			= $this->subtype;
+		$facture->subtype = $this->subtype;
 		$facture->socid 		    = $this->socid;
 		$facture->date              = $this->date;
 		$facture->date_pointoftax   = $this->date_pointoftax;
@@ -1149,7 +1149,7 @@ 
 
 		$facture->origin            = $this->origin;
 		$facture->origin_id         = $this->origin_id;
-		$facture->fk_account         = $this->fk_account;
+		$facture->fk_account = $this->fk_account;
 
 		$facture->lines = $this->lines; // Array of lines of invoice
 		$facture->situation_counter = $this->situation_counter;
@@ -1620,7 +1620,7 @@ 
 	{
 		global $conf, $langs, $hookmanager, $action;
 
-		if (! in_array($origin->element, array('propal', 'commande'))) {
+		if (!in_array($origin->element, array('propal', 'commande'))) {
 			$origin->error = 'ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder';
 			return null;
 		}
@@ -1630,7 +1630,7 @@ 
 			return null;
 		}
 
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 		if ($date > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 			$origin->error = 'ErrorDateIsInFuture';
@@ -1674,7 +1674,7 @@ 
 		$deposit->pos_source = $origin->pos_source;
 		$deposit->model_pdf = 'crabe';
 
-		$modelByTypeConfName = 'FACTURE_ADDON_PDF_' . $deposit->type;
+		$modelByTypeConfName = 'FACTURE_ADDON_PDF_'.$deposit->type;
 
 		if (!empty($conf->global->$modelByTypeConfName)) {
 			$deposit->model_pdf = $conf->global->$modelByTypeConfName;
@@ -1729,10 +1729,10 @@ 
 					continue;
 				}
 				$TTotalByTva[$line->tva_tx] += $line->total_ttc;
-				$descriptions[$line->tva_tx] .= '<li>' . (!empty($line->product_ref) ? $line->product_ref . ' - ' :  '');
-				$descriptions[$line->tva_tx] .= (!empty($line->product_label) ? $line->product_label . ' - ' : '');
-				$descriptions[$line->tva_tx] .= $langs->trans('Qty') . ' : ' . $line->qty;
-				$descriptions[$line->tva_tx] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($line->total_ht) . '</li>';
+				$descriptions[$line->tva_tx] .= '<li>'.(!empty($line->product_ref) ? $line->product_ref.' - ' : '');
+				$descriptions[$line->tva_tx] .= (!empty($line->product_label) ? $line->product_label.' - ' : '');
+				$descriptions[$line->tva_tx] .= $langs->trans('Qty').' : '.$line->qty;
+				$descriptions[$line->tva_tx] .= ' - '.$langs->trans('TotalHT').' : '.price($line->total_ht).'</li>';
 			}
 
 			foreach ($TTotalByTva as $tva => &$total) {
@@ -1756,10 +1756,10 @@ 
 				$totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
 				$tva_tx = $lines[$i]->tva_tx;
 				$amountdeposit[$tva_tx] += ($lines[$i]->total_ht * $origin->deposit_percent) / 100;
-				$descriptions[$tva_tx] .= '<li>' . (!empty($lines[$i]->product_ref) ? $lines[$i]->product_ref . ' - ' :  '');
-				$descriptions[$tva_tx] .= (!empty($lines[$i]->product_label) ? $lines[$i]->product_label . ' - ' : '');
-				$descriptions[$tva_tx] .= $langs->trans('Qty') . ' : ' . $lines[$i]->qty;
-				$descriptions[$tva_tx] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($lines[$i]->total_ht) . '</li>';
+				$descriptions[$tva_tx] .= '<li>'.(!empty($lines[$i]->product_ref) ? $lines[$i]->product_ref.' - ' : '');
+				$descriptions[$tva_tx] .= (!empty($lines[$i]->product_label) ? $lines[$i]->product_label.' - ' : '');
+				$descriptions[$tva_tx] .= $langs->trans('Qty').' : '.$lines[$i]->qty;
+				$descriptions[$tva_tx] .= ' - '.$langs->trans('TotalHT').' : '.price($lines[$i]->total_ht).'</li>';
 			}
 
 			if ($totalamount == 0) {
@@ -1774,11 +1774,11 @@ 
 				continue;
 			}
 
-			$descline = '(DEPOSIT) ('. $origin->deposit_percent .'%) - '.$origin->ref;
+			$descline = '(DEPOSIT) ('.$origin->deposit_percent.'%) - '.$origin->ref;
 
 			// Hidden conf
 			if (!empty($conf->global->INVOICE_DEPOSIT_VARIABLE_MODE_DETAIL_LINES_IN_DESCRIPTION) && !empty($descriptions[$tva])) {
-				$descline .= '<ul>' . $descriptions[$tva] . '</ul>';
+				$descline .= '<ul>'.$descriptions[$tva].'</ul>';
 			}
 
 			$addlineResult = $deposit->addline(
@@ -2040,7 +2040,7 @@ 
 				$label = $langs->trans("Invoice");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';
 		}
 
@@ -2151,9 +2151,9 @@ 
 				$this->id = $obj->rowid;
 				$this->entity = $obj->entity;
 
-				$this->ref					= $obj->ref;
-				$this->ref_client			= $obj->ref_client;
-				$this->ref_customer			= $obj->ref_client;
+				$this->ref = $obj->ref;
+				$this->ref_client = $obj->ref_client;
+				$this->ref_customer = $obj->ref_client;
 				$this->ref_ext				= $obj->ref_ext;
 				$this->type					= $obj->type;
 				$this->subtype				= $obj->subtype;
@@ -2179,7 +2179,7 @@ 
 				$this->fk_project = $obj->fk_project;
 				$this->project = null; // Clear if another value was already set by fetch_projet
 
-				$this->statut = $obj->status;	// deprecated
+				$this->statut = $obj->status; // deprecated
 				$this->status = $obj->status;
 
 				$this->date_lim_reglement = $this->db->jdate($obj->dlr);
@@ -2195,7 +2195,7 @@ 
 				$this->fk_fac_rec_source	= $obj->fk_fac_rec_source;
 				$this->note = $obj->note_private; // deprecated
 				$this->note_private = $obj->note_private;
-				$this->note_public			= $obj->note_public;
+				$this->note_public = $obj->note_public;
 				$this->user_creation_id     = $obj->fk_user_author;
 				$this->user_validation_id   = $obj->fk_user_valid;
 				$this->user_modification_id = $obj->fk_user_modif;
@@ -2311,7 +2311,7 @@ 
 				$line->ref              = $objp->product_ref; // Ref product
 				$line->product_ref      = $objp->product_ref; // Ref product
 				$line->libelle          = $objp->product_label; // deprecated
-				$line->product_label 	= $objp->product_label; // Label product
+				$line->product_label = $objp->product_label; // Label product
 				$line->product_barcode  = $objp->product_barcode; // Barcode number product
 				$line->product_desc     = $objp->product_desc; // Description product
 				$line->fk_product_type  = $objp->fk_product_type; // Type of product
@@ -2607,7 +2607,7 @@ 
 				$facligne->rang = 1;
 				$linecount = count($this->lines);
 				for ($ii = 1; $ii <= $linecount; $ii++) {
-					$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii+1);
+					$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
 				}
 			}
 
@@ -3183,7 +3183,7 @@ 
 		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('facture', 'creer'))
 		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('facture', 'invoice_advance', 'validate'))) {
 			$this->error = 'Permission denied';
-			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS=' . getDolGlobalString('MAIN_USE_ADVANCED_PERMS'), LOG_ERR);
+			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS='.getDolGlobalString('MAIN_USE_ADVANCED_PERMS'), LOG_ERR);
 			return -1;
 		}
 		if (!empty($conf->global-> INVOICE_CHECK_POSTERIOR_DATE)) {
@@ -3527,7 +3527,7 @@ 
 			// Set new ref and define current status
 			if (!$error) {
 				$this->ref = $num;
-				$this->statut = self::STATUS_VALIDATED;	// deprecated
+				$this->statut = self::STATUS_VALIDATED; // deprecated
 				$this->status = self::STATUS_VALIDATED;
 				$this->date_validation = $now;
 				$i = 0;
@@ -3672,7 +3672,7 @@ 
 
 			if ($error == 0) {
 				$old_statut = $this->status;
-				$this->statut = self::STATUS_DRAFT;	// deprecated
+				$this->statut = self::STATUS_DRAFT; // deprecated
 				$this->status = self::STATUS_DRAFT;
 
 				// Call trigger
@@ -4003,7 +4003,7 @@ 
 				return -2;
 			}
 		} else {
-			$this->errors[]='status of invoice must be Draft to allow use of ->addline()';
+			$this->errors[] = 'status of invoice must be Draft to allow use of ->addline()';
 			dol_syslog(get_class($this)."::addline status of invoice must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -4569,7 +4569,7 @@ 
 		}
 
 		if (!empty($addon)) {
-			dol_syslog("Call getNextNumRef with ".$addonConstName." = " . getDolGlobalString('FACTURE_ADDON').", thirdparty=".$soc->name.", type=".$soc->typent_code.", mode=".$mode, LOG_DEBUG);
+			dol_syslog("Call getNextNumRef with ".$addonConstName." = ".getDolGlobalString('FACTURE_ADDON').", thirdparty=".$soc->name.", type=".$soc->typent_code.", mode=".$mode, LOG_DEBUG);
 
 			$mybool = false;
 
@@ -5639,14 +5639,14 @@ 
 		if (!empty($paymentmode) && $paymentmode != 'all') {
 			$sql .= ", ".MAIN_DB_PREFIX."c_paiement as cp";
 		}
-		$sql .= " WHERE f.paye = 0";	// Only unpaid
-		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED;	// Only validated status
+		$sql .= " WHERE f.paye = 0"; // Only unpaid
+		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED; // Only validated status
 		if ($datetouse == 'invoicedate') {
 			$sql .= " AND f.datef = '".$this->db->idate($tmpidate, 'gmt')."'";
 		} else {
 			$sql .= " AND f.date_lim_reglement = '".$this->db->idate($tmpidate, 'gmt')."'";
 		}
-		$sql .= " AND f.entity IN (".getEntity('facture', 0).")";	// One batch process only one company (no sharing)
+		$sql .= " AND f.entity IN (".getEntity('facture', 0).")"; // One batch process only one company (no sharing)
 		if (!empty($paymentmode) && $paymentmode != 'all') {
 			$sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '".$this->db->escape($paymentmode)."'";
 		}
@@ -5854,7 +5854,7 @@ 
 								$actioncomm->create($user);
 							}
 
-							$this->db->commit();	// We always commit
+							$this->db->commit(); // We always commit
 						}
 
 						if ($errormesg) {
@@ -5890,7 +5890,7 @@ 
 		// get date of last validated invoices of same type
 		$sql  = "SELECT datef";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql .= " WHERE type = " . (int) $this->type ;
+		$sql .= " WHERE type = ".(int) $this->type;
 		$sql .= " AND date_valid IS NOT NULL";
 		$sql .= " AND entity IN (".getEntity('invoice').")";
 		$sql .= " ORDER BY datef DESC LIMIT 1";
@@ -6080,7 +6080,7 @@ 
 			$objp = $this->db->fetch_object($result);
 
 			if (!$objp) {
-				$this->error = 'InvoiceLine with id '. $rowid .' not found sql='.$sql;
+				$this->error = 'InvoiceLine with id '.$rowid.' not found sql='.$sql;
 				return 0;
 			}
 

htdocs/projet/activity/perday.php

Braces +8 added lines, -2 removed lines

@@ -96,8 +96,14 @@
 }
 
 $daytoparsegmt = dol_now('gmt');
-if ($yearofday && $monthofday && $dayofday) $daytoparsegmt = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday, 'gmt'); // xxxofday is value of day after submit action 'addtime'
-elseif ($year && $month && $day) $daytoparsegmt = dol_mktime(0, 0, 0, $month, $day, $year, 'gmt'); // this are value submited after submit of action 'submitdateselect'
+if ($yearofday && $monthofday && $dayofday) {
+	$daytoparsegmt = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday, 'gmt');
+}
+// xxxofday is value of day after submit action 'addtime'
+elseif ($year && $month && $day) {
+	$daytoparsegmt = dol_mktime(0, 0, 0, $month, $day, $year, 'gmt');
+}
+// this are value submited after submit of action 'submitdateselect'
 
 if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id) {
 	$usertoprocess = $user;

htdocs/expensereport/payment/list.php

Spacing +12 added lines, -12 removed lines

@@ -53,20 +53,20 @@ 
 // Security check
 if ($user->socid) $socid = $user->socid;
 
-$search_ref				= GETPOST('search_ref', 'alpha');
-$search_date_startday	= GETPOST('search_date_startday', 'int');
-$search_date_startmonth	= GETPOST('search_date_startmonth', 'int');
-$search_date_startyear	= GETPOST('search_date_startyear', 'int');
+$search_ref = GETPOST('search_ref', 'alpha');
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
 $search_date_endday		= GETPOST('search_date_endday', 'int');
-$search_date_endmonth	= GETPOST('search_date_endmonth', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
 $search_date_endyear	= GETPOST('search_date_endyear', 'int');
-$search_date_start		= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
-$search_date_end		= dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
-$search_user			= GETPOST('search_user', 'alpha');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
+$search_user = GETPOST('search_user', 'alpha');
 $search_payment_type	= GETPOST('search_payment_type');
-$search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
+$search_cheque_num = GETPOST('search_cheque_num', 'alpha');
 $search_bank_account	= GETPOST('search_bank_account', 'int');
-$search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
+$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
@@ -198,10 +198,10 @@ 
 	$sql .= natural_search('pndf.rowid', $search_ref);
 }
 if ($search_date_start) {
-	$sql .= " AND pndf.datep >= '" . $db->idate($search_date_start) . "'";
+	$sql .= " AND pndf.datep >= '".$db->idate($search_date_start)."'";
 }
 if ($search_date_end) {
-	$sql .=" AND pndf.datep <= '" . $db->idate($search_date_end) . "'";
+	$sql .= " AND pndf.datep <= '".$db->idate($search_date_end)."'";
 }
 
 if ($search_user) {

Braces +3 added lines, -1 removed lines

@@ -49,7 +49,9 @@
 $socid = GETPOST('socid', 'int');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 
 $search_ref				= GETPOST('search_ref', 'alpha');
 $search_date_startday	= GETPOST('search_date_startday', 'int');

htdocs/recruitment/recruitmentjobposition_list.php

Spacing +1 added lines, -1 removed lines

@@ -303,7 +303,7 @@
 					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t.".$db->escape($columnName)." <= '" . $db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}

htdocs/debugbar/class/DataCollector/DolLogsCollector.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	{
 		global $conf;
 
-		$uselogfile =  getDolGlobalInt('DEBUGBAR_USE_LOG_FILE');
+		$uselogfile = getDolGlobalInt('DEBUGBAR_USE_LOG_FILE');
 
 		if ($uselogfile) {
 			$this->getStorageLogs($this->path);

htdocs/admin/emailcollector_list.php

Spacing +1 added lines, -1 removed lines

@@ -507,7 +507,7 @@
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
 		$totalarray['nbfield']++;