Dolibarr / dolibarr

htdocs/product/class/product.class.php

Spacing +60 added lines, -60 removed lines

@@ -87,7 +87,7 @@ 
 		'contratdet' => array('name' => 'Contract', 'parent' => 'contrat', 'parentkey' => 'fk_contrat'),
 		'facture_fourn_det' => array('name' => 'SupplierInvoice', 'parent' => 'facture_fourn', 'parentkey' => 'fk_facture_fourn'),
 		'commande_fournisseurdet' => array('name' => 'SupplierOrder', 'parent' => 'commande_fournisseur', 'parentkey' => 'fk_commande'),
-		'mrp_production' => array('name' => 'Mo', 'parent' => 'mrp_mo', 'parentkey' => 'fk_mo' ),
+		'mrp_production' => array('name' => 'Mo', 'parent' => 'mrp_mo', 'parentkey' => 'fk_mo'),
 		'bom_bom' => array('name' => 'BOM'),
 		'bom_bomline' => array('name' => 'BOMLine', 'parent' => 'bom_bom', 'parentkey' => 'fk_bom'),
 	);
@@ -155,7 +155,7 @@ 
 	/**
 	 * @var string
 	 */
-	public $price_formated;			// used by takepos/ajax/ajax.php
+	public $price_formated; // used by takepos/ajax/ajax.php
 
 	/**
 	 * Selling price with tax
@@ -167,7 +167,7 @@ 
 	/**
 	 * @var string
 	 */
-	public $price_ttc_formated;		// used by takepos/ajax/ajax.php
+	public $price_ttc_formated; // used by takepos/ajax/ajax.php
 
 	/**
 	 * Minimum price net
@@ -517,7 +517,7 @@ 
 	/**
 	 * @var int|string
 	 */
-	public $weight_units;	// scale -3, 0, 3, 6
+	public $weight_units; // scale -3, 0, 3, 6
 	/**
 	 * @var float|string
 	 */
@@ -525,7 +525,7 @@ 
 	/**
 	 * @var int|string
 	 */
-	public $length_units;	// scale -3, 0, 3, 6
+	public $length_units; // scale -3, 0, 3, 6
 	/**
 	 * @var float|string
 	 */
@@ -533,7 +533,7 @@ 
 	/**
 	 * @var int|string
 	 */
-	public $width_units;	// scale -3, 0, 3, 6
+	public $width_units; // scale -3, 0, 3, 6
 	/**
 	 * @var float|string|null
 	 */
@@ -541,7 +541,7 @@ 
 	/**
 	 * @var int|string|null
 	 */
-	public $height_units;	// scale -3, 0, 3, 6
+	public $height_units; // scale -3, 0, 3, 6
 	/**
 	 * @var float|string|null
 	 */
@@ -549,7 +549,7 @@ 
 	/**
 	 * @var int|string|null
 	 */
-	public $surface_units;	// scale -3, 0, 3, 6
+	public $surface_units; // scale -3, 0, 3, 6
 	/**
 	 * @var float|string|null
 	 */
@@ -557,7 +557,7 @@ 
 	/**
 	 * @var int|string|null
 	 */
-	public $volume_units;	// scale -3, 0, 3, 6
+	public $volume_units; // scale -3, 0, 3, 6
 
 	/**
 	 * @var float|string|null
@@ -566,7 +566,7 @@ 
 	/**
 	 * @var ?string
 	 */
-	public $net_measure_units;	// scale -3, 0, 3, 6
+	public $net_measure_units; // scale -3, 0, 3, 6
 
 	/**
 	 * @var string
@@ -819,7 +819,7 @@ 
 		'import_key'    => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'index' => 0, 'position' => 1000),
 		//'tosell'       =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>'0', 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
 		//'tobuy'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>'0', 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
-		'mandatory_period' => array('type' => 'integer', 'label' => 'mandatoryperiod', 'enabled' => 1, 'visible' => 1,  'notnull' => 1, 'default' => '0', 'index' => 1,  'position' => 1000),
+		'mandatory_period' => array('type' => 'integer', 'label' => 'mandatoryperiod', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'default' => '0', 'index' => 1, 'position' => 1000),
 	);
 
 	/**
@@ -1123,9 +1123,9 @@ 
 
 							// update accountancy for this entity
 							if (!$error && getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-								$this->db->query("DELETE FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = " .((int) $this->id) . " AND entity = " . ((int) $conf->entity));
+								$this->db->query("DELETE FROM ".$this->db->prefix()."product_perentity WHERE fk_product = ".((int) $this->id)." AND entity = ".((int) $conf->entity));
 
-								$sql = "INSERT INTO " . $this->db->prefix() . "product_perentity (";
+								$sql = "INSERT INTO ".$this->db->prefix()."product_perentity (";
 								$sql .= " fk_product";
 								$sql .= ", entity";
 								$sql .= ", accountancy_code_buy";
@@ -1136,13 +1136,13 @@ 
 								$sql .= ", accountancy_code_sell_export";
 								$sql .= ") VALUES (";
 								$sql .= $this->id;
-								$sql .= ", " . ((int) $conf->entity);
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_intra) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_export) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_export) . "'";
+								$sql .= ", ".((int) $conf->entity);
+								$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_buy_intra)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_buy_export)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_sell_intra)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";
 								$sql .= ")";
 								$result = $this->db->query($sql);
 								if (!$result) {
@@ -1523,12 +1523,12 @@ 
 			$sql .= ", note_public = ".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : 'null');
 			$sql .= ", duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."'";
 			if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-				$sql .= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy) . "'";
-				$sql .= ", accountancy_code_buy_intra = '" . $this->db->escape($this->accountancy_code_buy_intra) . "'";
-				$sql .= ", accountancy_code_buy_export = '" . $this->db->escape($this->accountancy_code_buy_export) . "'";
-				$sql .= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell) . "'";
-				$sql .= ", accountancy_code_sell_intra= '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";
-				$sql .= ", accountancy_code_sell_export= '" . $this->db->escape($this->accountancy_code_sell_export) . "'";
+				$sql .= ", accountancy_code_buy = '".$this->db->escape($this->accountancy_code_buy)."'";
+				$sql .= ", accountancy_code_buy_intra = '".$this->db->escape($this->accountancy_code_buy_intra)."'";
+				$sql .= ", accountancy_code_buy_export = '".$this->db->escape($this->accountancy_code_buy_export)."'";
+				$sql .= ", accountancy_code_sell= '".$this->db->escape($this->accountancy_code_sell)."'";
+				$sql .= ", accountancy_code_sell_intra= '".$this->db->escape($this->accountancy_code_sell_intra)."'";
+				$sql .= ", accountancy_code_sell_export= '".$this->db->escape($this->accountancy_code_sell_export)."'";
 			}
 			$sql .= ", desiredstock = ".((isset($this->desiredstock) && is_numeric($this->desiredstock)) ? (float) $this->desiredstock : "null");
 			$sql .= ", cost_price = ".($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
@@ -1559,9 +1559,9 @@ 
 
 				// update accountancy for this entity
 				if (!$error && getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-					$this->db->query("DELETE FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = " . ((int) $this->id) . " AND entity = " . ((int) $conf->entity));
+					$this->db->query("DELETE FROM ".$this->db->prefix()."product_perentity WHERE fk_product = ".((int) $this->id)." AND entity = ".((int) $conf->entity));
 
-					$sql = "INSERT INTO " . $this->db->prefix() . "product_perentity (";
+					$sql = "INSERT INTO ".$this->db->prefix()."product_perentity (";
 					$sql .= " fk_product";
 					$sql .= ", entity";
 					$sql .= ", accountancy_code_buy";
@@ -1572,13 +1572,13 @@ 
 					$sql .= ", accountancy_code_sell_export";
 					$sql .= ") VALUES (";
 					$sql .= ((int) $this->id);
-					$sql .= ", " . ((int) $conf->entity);
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_intra) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_export) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_export) . "'";
+					$sql .= ", ".((int) $conf->entity);
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy_intra)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy_export)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell_intra)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";
 					$sql .= ")";
 					$result = $this->db->query($sql);
 					if (!$result) {
@@ -1656,7 +1656,7 @@ 
 								$error++;
 							} else {
 								// to keep old entries with the new dir
-								require_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmfiles.class.php';
+								require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 								$ecmfiles = new EcmFiles($this->db);
 								$ecmfiles->updateAfterRename("produit/".dol_sanitizeFileName($this->oldcopy->ref), "produit/".dol_sanitizeFileName($this->ref));
 							}
@@ -1954,7 +1954,7 @@ 
 				}
 			} elseif (isset($this->multilangs[$key])) {
 				if (empty($this->multilangs[$key]["label"])) {
-					$this->errors[] = $key . ' : ' . $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"));
+					$this->errors[] = $key.' : '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"));
 					return -1;
 				}
 
@@ -2149,7 +2149,7 @@ 
 	 */
 	private function getArrayForPriceCompare($level = 0)
 	{
-		$testExit = array('multiprices','multiprices_ttc','multiprices_base_type','multiprices_min','multiprices_min_ttc','multiprices_tva_tx','multiprices_recuperableonly');
+		$testExit = array('multiprices', 'multiprices_ttc', 'multiprices_base_type', 'multiprices_min', 'multiprices_min_ttc', 'multiprices_tva_tx', 'multiprices_recuperableonly');
 
 		foreach ($testExit as $field) {
 			if (!isset($this->$field)) {
@@ -2793,12 +2793,12 @@ 
 
 		//For MultiCompany
 		//PMP per entity & Stocks Sharings stock_reel includes only stocks shared with this entity
-		$separatedEntityPMP = false;	// Set to true to get the AWP from table llx_product_perentity instead of field 'pmp' into llx_product.
-		$separatedStock = false;		// Set to true will count stock from subtable llx_product_stock. It is slower than using denormalized field 'stock', but it is required when using multientity and shared warehouses.
+		$separatedEntityPMP = false; // Set to true to get the AWP from table llx_product_perentity instead of field 'pmp' into llx_product.
+		$separatedStock = false; // Set to true will count stock from subtable llx_product_stock. It is slower than using denormalized field 'stock', but it is required when using multientity and shared warehouses.
 		$visibleWarehousesEntities = $conf->entity;
 		if (getDolGlobalString('MULTICOMPANY_PRODUCT_SHARING_ENABLED')) {
 			if (getDolGlobalString('MULTICOMPANY_PMP_PER_ENTITY_ENABLED')) {
-				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = ".((int) $id)." AND entity = ".(int) $conf->entity);
+				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM ".$this->db->prefix()."product_perentity WHERE fk_product = ".((int) $id)." AND entity = ".(int) $conf->entity);
 				if ($this->db->num_rows($checkPMPPerEntity) > 0) {
 					$separatedEntityPMP = true;
 				}
@@ -2806,7 +2806,7 @@ 
 			global $mc;
 			$separatedStock = true;
 			if (isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])) {
-				$visibleWarehousesEntities .= "," . implode(",", $mc->sharings['stock']);
+				$visibleWarehousesEntities .= ",".implode(",", $mc->sharings['stock']);
 			}
 		}
 		if ($separatedEntityPMP) {
@@ -2824,10 +2824,10 @@ 
 		}
 		$sql .= " FROM ".$this->db->prefix()."product as p";
 		if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') || $separatedEntityPMP) {
-			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
 		}
 		if ($separatedStock) {
-			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_stock as sp ON sp.fk_product = p.rowid AND sp.fk_entrepot IN (SELECT rowid FROM ".$this->db->prefix()."entrepot WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_stock as sp ON sp.fk_product = p.rowid AND sp.fk_entrepot IN (SELECT rowid FROM ".$this->db->prefix()."entrepot WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
 		}
 
 		if ($id) {
@@ -2987,15 +2987,15 @@ 
 						$sql .= " WHERE entity IN (".getEntity('productprice').")";
 						$sql .= " AND price_level=".((int) $i);
 						$sql .= " AND fk_product = ".((int) $this->id);
-						$sql .= " ORDER BY date_price DESC, rowid DESC";	// Get the most recent line
-						$sql .= " LIMIT 1";									// Only the first one
+						$sql .= " ORDER BY date_price DESC, rowid DESC"; // Get the most recent line
+						$sql .= " LIMIT 1"; // Only the first one
 						$resql = $this->db->query($sql);
 						if ($resql) {
 							$result = $this->db->fetch_array($resql);
 
 							$this->multiprices[$i] = $result ? $result["price"] : null;
 							$this->multiprices_ttc[$i] = $result ? $result["price_ttc"] : null;
-							$this->multiprices_min[$i] =  $result ? $result["price_min"] : null;
+							$this->multiprices_min[$i] = $result ? $result["price_min"] : null;
 							$this->multiprices_min_ttc[$i] = $result ? $result["price_min_ttc"] : null;
 							$this->multiprices_base_type[$i] = $result ? $result["price_base_type"] : null;
 							// Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on
@@ -3220,7 +3220,7 @@ 
 				$obj = $this->db->fetch_object($result);
 				$this->stats_mo['customers_'.$role] = $obj->nb_customers ? $obj->nb_customers : 0;
 				$this->stats_mo['nb_'.$role] = $obj->nb ? $obj->nb : 0;
-				$this->stats_mo['qty_'.$role] = $obj->qty ? price2num($obj->qty, 'MS') : 0;		// qty may be a float due to the SUM()
+				$this->stats_mo['qty_'.$role] = $obj->qty ? price2num($obj->qty, 'MS') : 0; // qty may be a float due to the SUM()
 			} else {
 				$this->error = $this->db->error();
 				$error++;
@@ -4723,7 +4723,7 @@ 
 				//Addition of a product with the highest rank +1
 				$sql = "INSERT INTO ".$this->db->prefix()."product_association(fk_product_pere,fk_product_fils,qty,incdec,rang)";
 				$sql .= " VALUES (".((int) $id_pere).", ".((int) $id_fils).", ".price2num($qty, 'MS').", ".((int) $incdec).", ".((int) $rank).")";
-				if (! $this->db->query($sql)) {
+				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
 					return -1;
 				} else {
@@ -4844,7 +4844,7 @@ 
 				$sql = "UPDATE ".$this->db->prefix()."product_association";
 				$sql .= " SET rang = ".((int) $cpt);
 				$sql .= " WHERE rowid = ".((int) $objrank->rowid);
-				if (! $this->db->query($sql)) {
+				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
 					return -1;
 				}
@@ -5279,7 +5279,7 @@ 
 		if (isset($this->sousprods) && is_array($this->sousprods)) {
 			foreach ($this->sousprods as $prod_name => $desc_product) {
 				if (is_array($desc_product)) {
-					$this->fetch_prod_arbo($desc_product, "", $multiply, 1, $this->id, $ignore_stock_load);	// This set $this->res
+					$this->fetch_prod_arbo($desc_product, "", $multiply, 1, $this->id, $ignore_stock_load); // This set $this->res
 				}
 			}
 		}
@@ -5435,7 +5435,7 @@ 
 		$sql .= " AND pa.fk_product_fils <> ".((int) $id); // This should not happens, it is to avoid infinite loop if it happens
 		$sql .= " ORDER BY pa.rang";
 
-		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level. ' parents='.(is_array($parents) ? implode(',', $parents) : $parents), LOG_DEBUG);
+		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level.' parents='.(is_array($parents) ? implode(',', $parents) : $parents), LOG_DEBUG);
 
 		if ($level == 1) {
 			$alreadyfound = array($id => 1); // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediately
@@ -5500,7 +5500,7 @@ 
 			$parent[$this->label][$keyChild] = $valueChild;
 		}
 		foreach ($parent as $key => $value) {        // key=label, value is array of children
-			$this->sousprods[$key] = $value;  // @phan-suppress-current-line PhanTypeMismatchProperty
+			$this->sousprods[$key] = $value; // @phan-suppress-current-line PhanTypeMismatchProperty
 		}
 	}
 
@@ -5536,7 +5536,7 @@ 
 		if (!empty($this->entity) && $permissiontoreadproduct) {
 			$tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80, 0, 0, 0, 0, 1);
 			if ($this->nbphoto > 0) {
-				$datas['photo'] = '<div class="photointooltip floatright">'."\n" . $tmpphoto . '</div>';
+				$datas['photo'] = '<div class="photointooltip floatright">'."\n".$tmpphoto.'</div>';
 			}
 		}
 
@@ -5546,7 +5546,7 @@ 
 			$datas['picto'] = img_picto('', 'service').' <u class="paddingrightonly">'.$langs->trans("Service").'</u>';
 		}
 		if (isset($this->status) && isset($this->status_buy)) {
-			$datas['status'] = ' '.$this->getLibStatut(5, 0) . ' '.$this->getLibStatut(5, 1);
+			$datas['status'] = ' '.$this->getLibStatut(5, 0).' '.$this->getLibStatut(5, 1);
 		}
 
 		if (!empty($this->ref)) {
@@ -5596,7 +5596,7 @@ 
 					$labelsurfacevolume .= ($labelsurfacevolume ? " - " : "")."<b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuringUnitString(0, 'volume', $this->volume_units);
 				}
 				if ($labelsurfacevolume) {
-					$datas['surface'] = "<br>" . $labelsurfacevolume;
+					$datas['surface'] = "<br>".$labelsurfacevolume;
 				}
 			}
 			if ($this->isService() && !empty($this->duration_value)) {
@@ -5638,9 +5638,9 @@ 
 			}
 			// show categories for this record only in ajax to not overload lists
 			if (isModEnabled('category') && !$nofetch) {
-				require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 				$form = new Form($this->db);
-				$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_PRODUCT, 1);
+				$datas['categories'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_PRODUCT, 1);
 			}
 		}
 
@@ -6163,7 +6163,7 @@ 
 		if (isModEnabled("supplier_order")) {
 			$filterStatus = getDolGlobalString('SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK', '3,4');
 			if (isset($includedraftpoforvirtual)) {
-				$filterStatus = '0,1,2,'.$filterStatus;	// 1,2 may have already been inside $filterStatus but it is better to have twice than missing $filterStatus does not include them
+				$filterStatus = '0,1,2,'.$filterStatus; // 1,2 may have already been inside $filterStatus but it is better to have twice than missing $filterStatus does not include them
 			}
 			$result = $this->load_stats_commande_fournisseur(0, $filterStatus, 1, $dateofvirtualstock);
 			if ($result < 0) {
@@ -6580,7 +6580,7 @@ 
 		if (getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM')) {
 			$dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
 			foreach ($dirsociete as $dirroot) {
-				$res = dol_include_once($dirroot . getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM').'.php');
+				$res = dol_include_once($dirroot.getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM').'.php');
 				if ($res) {
 					break;
 				}

htdocs/product/stock/stockatdate.php

Spacing +22 added lines, -24 removed lines

@@ -48,7 +48,7 @@ 
 $type = GETPOSTINT('type');
 $mode = GETPOST('mode', 'alpha');
 
-$ext=(GETPOSTISSET('output') && in_array(GETPOST('output'), array('csv'))) ? GETPOST('output') : '';
+$ext = (GETPOSTISSET('output') && in_array(GETPOST('output'), array('csv'))) ? GETPOST('output') : '';
 
 $date = '';
 $dateendofday = '';
@@ -118,8 +118,8 @@ 
 	$socid = $user->socid;
 }
 
-$result = restrictedArea($user, 'produit|service');	// Must have permission to read product
-$result = restrictedArea($user, 'stock');	// Must have permission to read stock
+$result = restrictedArea($user, 'produit|service'); // Must have permission to read product
+$result = restrictedArea($user, 'stock'); // Must have permission to read stock
 
 
 /*
@@ -158,7 +158,7 @@ 
 	if ($productid > 0) {
 		$sql .= " AND ps.fk_product = ".((int) $productid);
 	}
-	if (! empty($search_fk_warehouse)) {
+	if (!empty($search_fk_warehouse)) {
 		$sql .= " AND ps.fk_entrepot IN (".$db->sanitize(implode(",", $search_fk_warehouse)).")";
 	}
 	if ($search_ref) {
@@ -249,8 +249,8 @@ 
 			$movements_prod_warehouse_nb[$fk_product][$fk_entrepot] = $nbofmovement;
 
 			// Pour llx_product.stock
-			$movements_prod[$fk_product] = $stock + (array_key_exists($fk_product, $movements_prod)?$movements_prod[$fk_product]:0);
-			$movements_prod_nb[$fk_product] = $nbofmovement + (array_key_exists($fk_product, $movements_prod_nb)?$movements_prod_nb[$fk_product]:0);
+			$movements_prod[$fk_product] = $stock + (array_key_exists($fk_product, $movements_prod) ? $movements_prod[$fk_product] : 0);
+			$movements_prod_nb[$fk_product] = $nbofmovement + (array_key_exists($fk_product, $movements_prod_nb) ? $movements_prod_nb[$fk_product] : 0);
 
 			$i++;
 		}
@@ -370,12 +370,11 @@ 
 if ($ext == 'csv') {
 	top_httphead("text/csv");
 	//header("Content-Type: text/csv");
-	header("Content-Disposition: attachment; filename=stock".($date?'-'.date("Y-m-d", $date):'').".csv");
+	header("Content-Disposition: attachment; filename=stock".($date ? '-'.date("Y-m-d", $date) : '').".csv");
 
 	// Lines of title
 	print implode(";", ($mode == 'future') ?
-		array('"Product Reference"', '"Label"', '"Current Stock"', '"'.$stocklabel.'"', '"Virtual Stock"'):
-		array('"Product Reference"', '"Label"', '"'.$stocklabel.'"', '"Estimated Stock Value"', '"Estimate Sell Value"', '"Movements"', '"Current Stock"'))."\r\n";
+		array('"Product Reference"', '"Label"', '"Current Stock"', '"'.$stocklabel.'"', '"Virtual Stock"') : array('"Product Reference"', '"Label"', '"'.$stocklabel.'"', '"Estimated Stock Value"', '"Estimate Sell Value"', '"Movements"', '"Current Stock"'))."\r\n";
 } else {
 	llxHeader('', $title, $helpurl, '', 0, 0, '', '', '', 'mod-product page-stock_stockatdate');
 
@@ -472,13 +471,13 @@ 
 	if ($num) {
 		print '<p>';
 		print '<a href="stockatdate.php?output=csv&sortfield='.urlencode($sortfield).'&sortorder='.urlencode($sortorder).'&type='.((int) $type).'&mode='.urlencode($mode).
-			(($productid > 0)?"&productid=".((int) $productid):'').
+			(($productid > 0) ? "&productid=".((int) $productid) : '').
 			$param_warehouse.
 			"&search_ref=".dol_escape_htmltag($search_ref).
 			"&search_nom=".dol_escape_htmltag($search_nom).
-			(GETPOSTISSET('dateday')?"&dateday=".GETPOSTINT('dateday'):'').
-			(GETPOSTISSET('datemonth')?"&datemonth=".GETPOSTINT('datemonth'):'').
-			(GETPOSTISSET('dateyear')?"&dateyear=".GETPOSTINT('dateyear'):'').
+			(GETPOSTISSET('dateday') ? "&dateday=".GETPOSTINT('dateday') : '').
+			(GETPOSTISSET('datemonth') ? "&datemonth=".GETPOSTINT('datemonth') : '').
+			(GETPOSTISSET('dateyear') ? "&dateyear=".GETPOSTINT('dateyear') : '').
 			'" title="Download CSV" />';
 		print img_picto('', 'download', 'class="pictofixedwidth"');
 		print 'Download CSV';
@@ -605,9 +604,9 @@ 
 
 		if ($mode == 'future') {
 			$prod->load_stock('warehouseopen,warehouseinternal,nobatch', 0, $dateendofday);
-			$stock = $prod->stock_theorique;		// virtual stock at a date
+			$stock = $prod->stock_theorique; // virtual stock at a date
 			$prod->load_stock('warehouseopen,warehouseinternal,nobatch', 0);
-			$virtualstock = $prod->stock_theorique;	// virtual stock in infinite future
+			$virtualstock = $prod->stock_theorique; // virtual stock in infinite future
 		} else {
 			$stock = $currentstock;
 			$nbofmovement = 0;
@@ -637,8 +636,8 @@ 
 					'"'.$objp->ref.'"',
 					'"'.$objp->label.'"',
 					'"'.price(price2num($stock, 'MS')).'"',
-					price2num($stock * $objp->pmp, 'MT')?'"'.price2num($stock * $objp->pmp, 'MT').'"':'',
-					!getDolGlobalString('PRODUIT_MULTIPRICES')?'"'.price2num($stock * $objp->price, 'MT').'"':'"'.$langs->trans("Variable").'('.$langs->trans("OptionMULTIPRICESIsOn").')"',
+					price2num($stock * $objp->pmp, 'MT') ? '"'.price2num($stock * $objp->pmp, 'MT').'"' : '',
+					!getDolGlobalString('PRODUIT_MULTIPRICES') ? '"'.price2num($stock * $objp->price, 'MT').'"' : '"'.$langs->trans("Variable").'('.$langs->trans("OptionMULTIPRICESIsOn").')"',
 					"$nbofmovement",
 					'"'.price2num($currentstock, 'MS').'"'))."\r\n";
 				$totalbuyingprice += $stock * $objp->pmp;
@@ -713,7 +712,7 @@ 
 						$url .= '&search_date_startyear='.GETPOSTINT('dateyear');
 					}
 					if (count($search_fk_warehouse) > 1) {
-						$url = '';	// Do not show link, multi warehouse as filter not managed yet by target page
+						$url = ''; // Do not show link, multi warehouse as filter not managed yet by target page
 					} else {
 						foreach ($search_fk_warehouse as $val) {
 							$url .= ($val > 0 ? '&search_warehouse='.((int) $val) : '');
@@ -751,7 +750,7 @@ 
 
 $parameters = array('sql'=>$sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
-if ($ext!='csv') {
+if ($ext != 'csv') {
 	print $hookmanager->resPrint;
 }
 
@@ -760,20 +759,19 @@ 
 	$colspan++;
 }
 
-if ($ext=='csv') {
+if ($ext == 'csv') {
 	print implode(";",
-		($mode == 'future')?array(
+		($mode == 'future') ? array(
 		'"'.$langs->trans("Totalforthispage").'"',
 		'',
 		$productid > 0 ? price2num($totalcurrentstock, 'MS') : '',
 		'',
-		price(price2num($totalvirtualstock, 'MS'))):
-		array(
+		price(price2num($totalvirtualstock, 'MS'))) : array(
 		'"'.$langs->trans("Totalforthispage").'"',
 		'',
 		'',
 		'"'.price2num($totalbuyingprice, 'MT').'"',
-		!getDolGlobalString('PRODUIT_MULTIPRICES')?'"'.price2num($totalsellingprice, 'MT').'"':'',
+		!getDolGlobalString('PRODUIT_MULTIPRICES') ? '"'.price2num($totalsellingprice, 'MT').'"' : '',
 		'',
 		$productid > 0 ? price2num($totalcurrentstock, 'MS') : ''));
 } else {

htdocs/product/stock/class/mouvementstock.class.php

Spacing +15 added lines, -15 removed lines

@@ -237,7 +237,7 @@ 
 				'skip_batch'       => &$skip_batch,
 				'id_product_batch' => &$id_product_batch
 			);
-			$reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 			if ($reshook < 0) {
 				if (!empty($hookmanager->resPrint)) {
@@ -579,7 +579,7 @@ 
 			// Update stock quantity
 			if (!$error) {
 				if ($alreadyarecord > 0) {
-					$sql = "UPDATE ".$this->db->prefix()."product_stock SET reel = " . ((float) $oldqtywarehouse + (float) $qty);
+					$sql = "UPDATE ".$this->db->prefix()."product_stock SET reel = ".((float) $oldqtywarehouse + (float) $qty);
 					$sql .= " WHERE fk_entrepot = ".((int) $entrepot_id)." AND fk_product = ".((int) $fk_product);
 				} else {
 					$sql = "INSERT INTO ".$this->db->prefix()."product_stock";
@@ -727,8 +727,8 @@ 
 				$this->price = $obj->price;
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->label = $obj->label;
-				$this->fk_origin = $obj->origin_id;		// For backward compatibility
-				$this->origintype = $obj->origin_type;	// For backward compatibility
+				$this->fk_origin = $obj->origin_id; // For backward compatibility
+				$this->origintype = $obj->origin_type; // For backward compatibility
 				$this->origin_id = $obj->origin_id;
 				$this->origin_type = $obj->origin_type;
 				$this->inventorycode = $obj->inventorycode;
@@ -963,8 +963,8 @@ 
 			} else {					// product_batch record not found
 				$pdluo->fk_product_stock = $vfk_product_stock;
 				$pdluo->qty = $qty;
-				$pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby'];		// No more used. Now eatby date is store in table of lot, no more into prouct_batch table.
-				$pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby'];		// No more used. Now sellby date is store in table of lot, no more into prouct_batch table.
+				$pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby']; // No more used. Now eatby date is store in table of lot, no more into prouct_batch table.
+				$pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby']; // No more used. Now sellby date is store in table of lot, no more into prouct_batch table.
 				$pdluo->batch = $vbatchnumber;
 
 				$result = $pdluo->create($user, 1);
@@ -1161,11 +1161,11 @@ 
 		$label .= '<div width="100%">';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->id;
 		$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
-		$qtylabel = (($this->qty > 0) ? '<span class="stockmovemententry">+' : '<span class="stockmovementexit">') . $this->qty . '</span>';
+		$qtylabel = (($this->qty > 0) ? '<span class="stockmovemententry">+' : '<span class="stockmovementexit">').$this->qty.'</span>';
 		if ($this->inventorycode) {
 			$label .= '<br><b>'.$langs->trans('InventoryCode').':</b> '.$this->inventorycode;
 		}
-		$label .= '<br><b>'.$langs->trans('Qty').':</b> ' . $qtylabel;
+		$label .= '<br><b>'.$langs->trans('Qty').':</b> '.$qtylabel;
 		if ($this->batch) {
 			$label .= '<br><b>'.$langs->trans('Batch').':</b> '.$this->batch;
 		}
@@ -1293,8 +1293,8 @@ 
 		$sql = "SELECT sum(pb.qty) as cpt";
 		$sql .= " FROM ".$this->db->prefix()."product_batch as pb";
 		$sql .= " INNER JOIN ".$this->db->prefix()."product_stock as ps ON ps.rowid = pb.fk_product_stock";
-		$sql .= " WHERE ps.fk_product = " . ((int) $fk_product);
-		$sql .= " AND pb.batch = '" . $this->db->escape($batch) . "'";
+		$sql .= " WHERE ps.fk_product = ".((int) $fk_product);
+		$sql .= " AND pb.batch = '".$this->db->escape($batch)."'";
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -1318,7 +1318,7 @@ 
 	 */
 	public function reverseMouvement()
 	{
-		$formattedDate = "REVERTMV" .dol_print_date($this->datem, '%Y%m%d%His');
+		$formattedDate = "REVERTMV".dol_print_date($this->datem, '%Y%m%d%His');
 		if ($this->label == 'Annulation movement ID'.$this->id) {
 			return -1;
 		}
@@ -1354,11 +1354,11 @@ 
 	{
 		$date = '';
 
-		$sql = 	"SELECT MAX(datem) as datem";
+		$sql = "SELECT MAX(datem) as datem";
 		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement";
-		$sql .= " WHERE fk_product = " . ((int) $fk_product);
-		$sql .= " AND fk_entrepot  = " .((int) $fk_entrepot);
-		$sql .= " AND batch = '" . $this->db->escape($batch) . "'";
+		$sql .= " WHERE fk_product = ".((int) $fk_product);
+		$sql .= " AND fk_entrepot  = ".((int) $fk_entrepot);
+		$sql .= " AND batch = '".$this->db->escape($batch)."'";
 
 		$result = $this->db->query($sql);
 		if ($result) {

htdocs/variants/list.php

Spacing +19 added lines, -19 removed lines

@@ -141,7 +141,7 @@ 
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 $permissiontoread = $user->hasRight('variants', 'read');
 $permissiontoadd = $user->hasRight('variants', 'write');
@@ -323,7 +323,7 @@ 
 //}
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace("/,\s*$/", "", $sql);
 
@@ -390,7 +390,7 @@ 
 if ($num == 1 && getDolGlobalInt('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
-	header("Location: " . dol_buildpath('/variants/card.php', 2) . '?id='.((int) $id));
+	header("Location: ".dol_buildpath('/variants/card.php', 2).'?id='.((int) $id));
 	exit;
 }
 
@@ -517,7 +517,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -622,7 +622,7 @@ 
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $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.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
 		$totalarray['nbfield']++;
@@ -724,23 +724,23 @@ 
 		foreach ($object->fields as $key => $val) {
 			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-				$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
 			} elseif ($key == 'status') {
-				$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
 			}
 
 			if (in_array($val['type'], array('timestamp'))) {
-				$cssforfield .= ($cssforfield ? ' ' : '') . 'nowraponall';
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
 			} elseif ($key == 'ref') {
-				$cssforfield .= ($cssforfield ? ' ' : '') . 'nowraponall';
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
 			}
 
 			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && empty($val['arrayofkeyval'])) {
-				$cssforfield .= ($cssforfield ? ' ' : '') . 'right';
+				$cssforfield .= ($cssforfield ? ' ' : '').'right';
 			}
 			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
-			if (!empty($arrayfields['t.' . $key]['checked'])) {
+			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.((preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) {
 					print ' title="'.dol_escape_htmltag($object->$key).'"';
@@ -759,15 +759,15 @@ 
 				}
 				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 					if (!$i) {
-						$totalarray['pos'][$totalarray['nbfield']] = 't.' . $key;
+						$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 					}
 					if (!isset($totalarray['val'])) {
 						$totalarray['val'] = array();
 					}
-					if (!isset($totalarray['val']['t.' . $key])) {
-						$totalarray['val']['t.' . $key] = 0;
+					if (!isset($totalarray['val']['t.'.$key])) {
+						$totalarray['val']['t.'.$key] = 0;
 					}
-					$totalarray['val']['t.' . $key] += $object->$key;
+					$totalarray['val']['t.'.$key] += $object->$key;
 				}
 			}
 		}
@@ -814,17 +814,17 @@ 
 		// Move
 		print '<td class="center linecolmove tdlineupdown">';
 		if ($i > 0) {
-			print '<a class="lineupdown" href="' . $_SERVER['PHP_SELF'] . '?action=up&amp;rowid=' . $obj->rowid . '">' . img_up('default', 0, 'imgupforline') . '</a>';
+			print '<a class="lineupdown" href="'.$_SERVER['PHP_SELF'].'?action=up&amp;rowid='.$obj->rowid.'">'.img_up('default', 0, 'imgupforline').'</a>';
 		}
 		if ($i < $num - 1) {
-			print '<a class="lineupdown" href="' . $_SERVER['PHP_SELF'] . '?action=down&amp;rowid=' . $obj->rowid . '">' . img_down('default', 0, 'imgdownforline') . '</a>';
+			print '<a class="lineupdown" href="'.$_SERVER['PHP_SELF'].'?action=down&amp;rowid='.$obj->rowid.'">'.img_down('default', 0, 'imgdownforline').'</a>';
 		}
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 
-		print '</tr>' . "\n";
+		print '</tr>'."\n";
 	}
 
 	$i++;
@@ -841,7 +841,7 @@ 
 			$colspan++;
 		}
 	}
-	$colspan++; 	// For the move column
+	$colspan++; // For the move column
 	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 

htdocs/install/step2.php

Spacing +4 added lines, -4 removed lines

@@ -40,9 +40,9 @@ 
 // Only works if you are not in safe_mode. / Ne fonctionne que si on est pas en safe_mode.
 
 $err = error_reporting();
-error_reporting(0);      // Disable all errors
+error_reporting(0); // Disable all errors
 //error_reporting(E_ALL);
-@set_time_limit(1800);   // Need 1800 on some very slow OS like Windows 7/64
+@set_time_limit(1800); // Need 1800 on some very slow OS like Windows 7/64
 error_reporting($err);
 
 $action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]);
@@ -91,7 +91,7 @@ 
 
 dolibarr_install_syslog("--- step2: entering step2.php page");
 
-'@phan-var-force string $dolibarr_main_db_prefix';  // From configuraiotn file or install/inc.php
+'@phan-var-force string $dolibarr_main_db_prefix'; // From configuraiotn file or install/inc.php
 
 
 /*
@@ -591,7 +591,7 @@ 
 
 $conf->file->instance_unique_id = (empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id); // Unique id of instance
 
-$hash_unique_id = dol_hash('dolibarr'.$conf->file->instance_unique_id, 'sha256');	// Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
+$hash_unique_id = dol_hash('dolibarr'.$conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
 
 $out  = '<input type="checkbox" name="dolibarrpingno" id="dolibarrpingno"'.((getDolGlobalString('MAIN_FIRST_PING_OK_ID') == 'disabled') ? '' : ' value="checked" checked="true"').'> ';
 $out .= '<label for="dolibarrpingno">'.$langs->trans("MakeAnonymousPing").'</label>';

htdocs/workstation/class/workstation.class.php

Spacing +5 added lines, -5 removed lines

@@ -112,7 +112,7 @@ 
 		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
 		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 512, 'notnull' => -1, 'visible' => -2,),
 		'nb_operators_required' => array('type' => 'integer', 'label' => 'NbOperatorsRequired', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right', 'csslist' => 'maxwidth75imp'),
-		'thm_operator_estimated' => array('type' => 'double', 'help' => 'THMOperatorEstimatedHelp','label' => 'THMOperatorEstimated', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right', 'csslist' => 'maxwidth75imp'),
+		'thm_operator_estimated' => array('type' => 'double', 'help' => 'THMOperatorEstimatedHelp', 'label' => 'THMOperatorEstimated', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right', 'csslist' => 'maxwidth75imp'),
 		'thm_machine_estimated' => array('type' => 'double', 'help' => 'THMMachineEstimatedHelp', 'label' => 'THMMachineEstimated', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right', 'csslist' => 'maxwidth75imp'),
 		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => 1, 'position' => 1000, 'default' => '1', 'notnull' => 1, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Disabled', '1' => 'Enabled'),),
 	);
@@ -135,7 +135,7 @@ 
 	/**
 	 * @var string type
 	 */
-	public $type;	// HUMAN, MACHINE, ...
+	public $type; // HUMAN, MACHINE, ...
 
 	/**
 	 * @var int User ID
@@ -236,7 +236,7 @@ 
 		$id = $this->createCommon($user, $notrigger);
 
 		// Usergroups
-		$groups = GETPOST('groups', 'array:int');	// FIXME We should not GETPOST but receive array as parameter
+		$groups = GETPOST('groups', 'array:int'); // FIXME We should not GETPOST but receive array as parameter
 		if (empty($groups)) {
 			$groups = $this->usergroups; // createFromClone
 		}
@@ -251,7 +251,7 @@ 
 		}
 
 		// Resources
-		$resources = GETPOST('resources', 'array:int');	// FIXME We should not GETPOST but receive array as parameter
+		$resources = GETPOST('resources', 'array:int'); // FIXME We should not GETPOST but receive array as parameter
 		if (empty($resources)) {
 			$resources = $this->resources; // createFromClone
 		}
@@ -866,7 +866,7 @@ 
 		if (getDolGlobalString('WORKSTATION_WORKSTATION_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('WORKSTATION_WORKSTATION_ADDON') . ".php";
+			$file = getDolGlobalString('WORKSTATION_WORKSTATION_ADDON').".php";
 			$classname = getDolGlobalString('WORKSTATION_WORKSTATION_ADDON');
 
 			// Include file with class

htdocs/adherents/card.php

Spacing +6 added lines, -6 removed lines

@@ -57,7 +57,7 @@ 
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
-$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');	// if not set, $backtopage will be used
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used
 $confirm = GETPOST('confirm', 'alpha');
 $rowid = GETPOSTINT('rowid');
 $id = GETPOST('id') ? GETPOSTINT('id') : $rowid;
@@ -301,7 +301,7 @@ 
 			$object->gender      = trim(GETPOST("gender", 'alphanohtml'));
 			$object->login       = trim(GETPOST("login", 'alphanohtml'));
 			if (GETPOSTISSET('pass')) {
-				$object->pass        = trim(GETPOST("pass", 'password'));	// For password, we must use 'none'
+				$object->pass = trim(GETPOST("pass", 'password')); // For password, we must use 'none'
 			}
 
 			$object->societe     = trim(GETPOST("societe", 'alphanohtml')); // deprecated
@@ -356,10 +356,10 @@ 
 			}
 
 			// Check if we need to also synchronize password information
-			$nosyncuserpass = 1;	// no by default
+			$nosyncuserpass = 1; // no by default
 			if (GETPOSTISSET('pass')) {
 				if ($object->user_id) {	// If member is linked to a user
-					$nosyncuserpass = 0;	// We may try to sync password
+					$nosyncuserpass = 0; // We may try to sync password
 					if ($user->id == $object->user_id) {
 						if (!$user->hasRight('user', 'self', 'password')) {
 							$nosyncuserpass = 1; // Disable synchronizing
@@ -469,7 +469,7 @@ 
 		$email = preg_replace('/\s+/', '', GETPOST("member_email", 'aZ09arobase'));
 		$url = trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
 		$login = GETPOST("member_login", 'alphanohtml');
-		$pass = GETPOST("password", 'password');	// For password, we use 'none'
+		$pass = GETPOST("password", 'password'); // For password, we use 'none'
 		$photo = GETPOST("photo", 'alphanohtml');
 		$morphy = GETPOST("morphy", 'alphanohtml');
 		$public = GETPOSTINT("public");
@@ -1291,7 +1291,7 @@ 
 			$maxfilesizearray = getMaxFileSizeArray();
 			$maxmin = $maxfilesizearray['maxmin'];
 			if ($maxmin > 0) {
-				print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+				print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 			}
 			print '<input type="file" class="flat" name="photo" id="photoinput">';
 			print '</td></tr>';

htdocs/categories/photos.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
  * Actions
  */
 
-$parameters = array('id' => $id,  'label' => $label, 'confirm' => $confirm, 'type' => $type, 'uploaddir' => $upload_dir, 'sendfile' => (GETPOST("sendit") ? true : false));
+$parameters = array('id' => $id, 'label' => $label, 'confirm' => $confirm, 'type' => $type, 'uploaddir' => $upload_dir, 'sendfile' => (GETPOST("sendit") ? true : false));
 // Note that $action and $object may be modified by some hooks
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
 if ($reshook < 0) {

htdocs/categories/traduction.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
 $type = $object->type;
 if (is_numeric($type)) {
-	$type = Categorie::$MAP_ID_TO_CODE[$type];   // For backward compatibility
+	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 }
 
 // Security check