Dolibarr / dolibarr

htdocs/product/stock/stats/commande_fournisseur.php

Spacing +3 added lines, -3 removed lines

@@ -82,8 +82,8 @@ 
 	$sortfield = "cf.date_commande";
 }
 
-$search_month = GETPOST('search_month');	// Can be ''
-$search_year = GETPOST('search_year');	// Can be '''
+$search_month = GETPOST('search_month'); // Can be ''
+$search_year = GETPOST('search_year'); // Can be '''
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$search_month = '';
@@ -241,7 +241,7 @@ 
 			}
 			$sql .= " WHERE cf.entity IN (".getEntity('product').")";
 			$sql .= " AND cfdi.batch = '".($db->escape($object->batch))."'";
-			$sql .= " AND cfdi.fk_product = " . (int) $object->fk_product;
+			$sql .= " AND cfdi.fk_product = ".(int) $object->fk_product;
 			if (!empty($search_month)) {
 				$sql .= ' AND MONTH(cf.date_commande) IN ('.$db->sanitize((string) $search_month).')';
 			}

htdocs/product/stock/stats/reception.php

Spacing +2 added lines, -2 removed lines

@@ -82,8 +82,8 @@
 	$sortfield = "recep.date_creation";
 }
 
-$search_month = GETPOST('search_month');	// Can be ''
-$search_year = GETPOST('search_year');	// Can be '''
+$search_month = GETPOST('search_month'); // Can be ''
+$search_year = GETPOST('search_year'); // Can be '''
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$search_month = '';

htdocs/product/stock/stats/expedition.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
 $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $batch = GETPOST('batch', 'alpha');
-$objectid  = GETPOSTINT('productid');
+$objectid = GETPOSTINT('productid');
 
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
@@ -82,8 +82,8 @@ 
 	$sortfield = "exp.date_creation";
 }
 
-$search_month = GETPOST('search_month');	// Can be ''
-$search_year = GETPOST('search_year');	// Can be '''
+$search_month = GETPOST('search_month'); // Can be ''
+$search_year = GETPOST('search_year'); // Can be '''
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$search_month = '';

htdocs/product/stock/stats/mo.php

Spacing +2 added lines, -2 removed lines

@@ -76,8 +76,8 @@
 	$sortfield = "c.date_valid";
 }
 
-$search_month = GETPOST('search_month');	// Can be ''
-$search_year = GETPOST('search_year');	// Can be '''
+$search_month = GETPOST('search_month'); // Can be ''
+$search_year = GETPOST('search_year'); // Can be '''
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$search_month = '';

htdocs/product/stock/card.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 $hookmanager->initHooks(array('warehousecard', 'stocklist', 'globalcard'));
 
 // Security check
-$result=restrictedArea($user, 'stock', $id, 'entrepot&stock');
+$result = restrictedArea($user, 'stock', $id, 'entrepot&stock');
 
 $object = new Entrepot($db);
 $extrafields = new ExtraFields($db);
@@ -253,7 +253,7 @@ 
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'update_extras' && $permissiontoeditextra) {
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		$attribute_name = GETPOST('attribute', 'aZ09');
 

htdocs/product/inventory/class/inventory.class.php

Spacing +6 added lines, -6 removed lines

@@ -53,10 +53,10 @@ 
 	 */
 	public $picto = 'inventory';
 
-	const STATUS_DRAFT     = 0;		// Draft
-	const STATUS_VALIDATED = 1;		// Inventory is in process
-	const STATUS_RECORDED  = 2;		// Inventory is finisged. Stock movement has been recorded.
-	const STATUS_CANCELED  = 9;		// Canceled
+	const STATUS_DRAFT     = 0; // Draft
+	const STATUS_VALIDATED = 1; // Inventory is in process
+	const STATUS_RECORDED  = 2; // Inventory is finisged. Stock movement has been recorded.
+	const STATUS_CANCELED  = 9; // Canceled
 
 	/**
 	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
@@ -96,7 +96,7 @@ 
 		'fk_warehouse'       => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Warehouse', 'visible' => 1, 'enabled' => 1, 'position' => 30, 'index' => 1, 'help' => 'InventoryForASpecificWarehouse', 'picto' => 'stock', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'tdoverflowmax150'),
 		'fk_product'         => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'get_name_url_params' => '0::0:-1:0::1', 'visible' => 1, 'enabled' => 1, 'position' => 32, 'index' => 1, 'help' => 'InventoryForASpecificProduct', 'picto' => 'product', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'tdoverflowmax150'),
 		'categories_product' => array('type' => 'chkbxlst:categorie:label:rowid::type=0:0:', 'label' => 'OrProductsWithCategories', 'visible' => 3, 'enabled' => 1, 'position' => 33, 'help' => '', 'picto' => 'category', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx'),
-		'date_inventory'     => array('type' => 'date', 'label' => 'DateValue', 'visible' => 1, 'enabled' => 'getDolGlobalInt("STOCK_INVENTORY_ADD_A_VALUE_DATE")', 'position' => 35, 'csslist' => 'nowraponall'),	// This date is not used so disabled by default.
+		'date_inventory'     => array('type' => 'date', 'label' => 'DateValue', 'visible' => 1, 'enabled' => 'getDolGlobalInt("STOCK_INVENTORY_ADD_A_VALUE_DATE")', 'position' => 35, 'csslist' => 'nowraponall'), // This date is not used so disabled by default.
 		'date_creation'      => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 500, 'csslist' => 'nowraponall'),
 		'tms'                => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 501, 'csslist' => 'nowraponall'),
 		'date_validation'    => array('type' => 'datetime', 'label' => 'DateValidation', 'visible' => -2, 'enabled' => 1, 'position' => 502, 'csslist' => 'nowraponall'),
@@ -287,7 +287,7 @@ 
 					$TChildWarehouses = array();
 					$this->getChildWarehouse($this->fk_warehouse, $TChildWarehouses);
 					if (!empty($TChildWarehouses)) {
-						$sql .= " OR ps.fk_entrepot IN (" . $this->db->sanitize(implode(',', $TChildWarehouses)) . ")";
+						$sql .= " OR ps.fk_entrepot IN (".$this->db->sanitize(implode(',', $TChildWarehouses)).")";
 					}
 				}
 				$sql .= ')';

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

Spacing +167 added lines, -167 removed lines

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

htdocs/fourn/class/fournisseur.orderline.class.php

Spacing +3 added lines, -3 removed lines

@@ -226,10 +226,10 @@
 					$sqlsearchpackage .= ' WHERE entity IN ('.getEntity('productsupplierprice').")";
 					$sqlsearchpackage .= " AND fk_product = ".((int) $objp->fk_product);
 					$sqlsearchpackage .= " AND ref_fourn = '".$this->db->escape($objp->ref_supplier)."'";
-					$sqlsearchpackage .= " AND quantity <= ".((float) $objp->qty);	// required to be qualified
-					$sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= ".((float) $objp->qty).")";	// required to be qualified
+					$sqlsearchpackage .= " AND quantity <= ".((float) $objp->qty); // required to be qualified
+					$sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= ".((float) $objp->qty).")"; // required to be qualified
 					$sqlsearchpackage .= " AND fk_soc = ".((int) $objp->socid);
-					$sqlsearchpackage .= " ORDER BY packaging ASC";		// Take the smaller package first
+					$sqlsearchpackage .= " ORDER BY packaging ASC"; // Take the smaller package first
 					$sqlsearchpackage .= " LIMIT 1";
 
 					$resqlsearchpackage = $this->db->query($sqlsearchpackage);

htdocs/core/lib/files.lib.php

Spacing +34 added lines, -34 removed lines

@@ -122,7 +122,7 @@ 
 	$utf8_path = preg_replace('/([\\/]+)$/', '', $utf8_path);
 
 	if (preg_match('/\*/', $utf8_path)) {
-		$utf8_path_array = glob($utf8_path, GLOB_ONLYDIR);	// This scan dir for files. If file does not exists, return empty.
+		$utf8_path_array = glob($utf8_path, GLOB_ONLYDIR); // This scan dir for files. If file does not exists, return empty.
 		//$os_path_array = dol_dir_list($utf8_path);
 	} else {
 		$utf8_path_array = array($utf8_path);
@@ -140,7 +140,7 @@ 
 				'types' => $types,
 				'recursive' => $recursive,
 				'filter' => $filter,
-				'excludefilter' => $exclude_array,  // Already converted to array.
+				'excludefilter' => $exclude_array, // Already converted to array.
 				'sortcriteria' => $sortcriteria,
 				'sortorder' => $sortorder,
 				'loaddate' => $loaddate,
@@ -173,7 +173,7 @@ 
 					$utf8_file = $os_file;
 				}
 
-				$utf8_fullpathfile = $utf8_path_cursor."/".$utf8_file;  // Temp variable for speed
+				$utf8_fullpathfile = $utf8_path_cursor."/".$utf8_file; // Temp variable for speed
 
 				// Check if file is qualified
 				$qualified = 1;
@@ -209,13 +209,13 @@ 
 								if (is_array($filter)) {
 									$chunks = array_chunk($filter, 500);
 									foreach ($chunks as $chunk) {
-										$testpregmatch = preg_match('/'.implode('|', $chunk).'/i', $utf8_file);	// May failed if $filter too large
+										$testpregmatch = preg_match('/'.implode('|', $chunk).'/i', $utf8_file); // May failed if $filter too large
 										if ($testpregmatch) {
 											break;
 										}
 									}
 								} else {
-									$testpregmatch = preg_match('/'.$filter.'/i', $utf8_file);		// May failed if $filter too large
+									$testpregmatch = preg_match('/'.$filter.'/i', $utf8_file); // May failed if $filter too large
 								}
 								if ($testpregmatch) {
 									$qualifiedforfilter = 1;
@@ -264,13 +264,13 @@ 
 							if (is_array($filter)) {
 								$chunks = array_chunk($filter, 500);
 								foreach ($chunks as $chunk) {
-									$testpregmatch = preg_match('/'.implode('|', $chunk).'/i', $utf8_file);	// May failed if $filter too large
+									$testpregmatch = preg_match('/'.implode('|', $chunk).'/i', $utf8_file); // May failed if $filter too large
 									if ($testpregmatch) {
 										break;
 									}
 								}
 							} else {
-								$testpregmatch = preg_match('/'.$filter.'/i', $utf8_file);		// May failed if $filter too large
+								$testpregmatch = preg_match('/'.$filter.'/i', $utf8_file); // May failed if $filter too large
 							}
 							if ($testpregmatch) {
 								$qualifiedforfilter = 1;
@@ -1028,7 +1028,7 @@ 
 	// Recursive function to copy all subdirectories and contents:
 	if (is_dir($ossrcfile)) {
 		$dir_handle = opendir($ossrcfile);
-		$tmpresult = 0;  // Initialised before loop to keep old behavior, may be needed inside loop
+		$tmpresult = 0; // Initialised before loop to keep old behavior, may be needed inside loop
 		while ($file = readdir($dir_handle)) {
 			if ($file != "." && $file != ".." && !is_link($ossrcfile."/".$file)) {
 				if (is_dir($ossrcfile."/".$file)) {
@@ -1212,7 +1212,7 @@ 
 					if (!empty($moreinfo) && !empty($moreinfo['gen_or_uploaded'])) {
 						$ecmfile->gen_or_uploaded = $moreinfo['gen_or_uploaded'];
 					} else {
-						$ecmfile->gen_or_uploaded = 'unknown';	// 'generated', 'uploaded', 'api'
+						$ecmfile->gen_or_uploaded = 'unknown'; // 'generated', 'uploaded', 'api'
 					}
 					if (!empty($moreinfo) && !empty($moreinfo['description'])) {
 						$ecmfile->description = $moreinfo['description']; // indexed content
@@ -1242,7 +1242,7 @@ 
 					if (!empty($moreinfo) && !empty($moreinfo['cover'])) {
 						$ecmfile->cover = $moreinfo['cover'];
 					}
-					if (! empty($entity)) {
+					if (!empty($entity)) {
 						$ecmfile->entity = $entity;
 					}
 
@@ -1568,7 +1568,7 @@ 
 
 		if ($return) {
 			dolChmod($file_name_osencoded);
-			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=" . getDolGlobalString('MAIN_UMASK'), LOG_DEBUG);
+			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".getDolGlobalString('MAIN_UMASK'), LOG_DEBUG);
 			return $successcode; // Success
 		} else {
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
@@ -1634,7 +1634,7 @@ 
 			$ok = true;
 			$globencoded = str_replace('[', '\[', $file_osencoded);
 			$globencoded = str_replace(']', '\]', $globencoded);
-			$listofdir = glob($globencoded);	// This scan dir for files. If file does not exists, return empty.
+			$listofdir = glob($globencoded); // This scan dir for files. If file does not exists, return empty.
 
 			if (!empty($listofdir) && is_array($listofdir)) {
 				foreach ($listofdir as $filename) {
@@ -2116,7 +2116,7 @@ 
 					$maxwidthmini = $tmparraysize['maxwidthmini'];
 					$maxheightmini = $tmparraysize['maxheightmini'];
 					//$quality = $tmparraysize['quality'];
-					$quality = 50;	// For thumbs, we force quality to 50
+					$quality = 50; // For thumbs, we force quality to 50
 
 					// Generate thumbs.
 					if ($generatethumbs) {
@@ -2310,7 +2310,7 @@ 
 			if (isset($object->table_element)) {
 				$ecmfile->src_object_type = $object->table_element;
 			} else {
-				dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.');
+				dol_syslog('Error: object '.get_class($object).' has no table_element attribute.');
 				return -1;
 			}
 			if (isset($object->src_object_description)) {
@@ -2464,9 +2464,9 @@ 
 		if (!$error) {
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'ecm_files';
 			if (isset($object->entity)) {
-				$sql .= ' WHERE entity = ' . ((int) $object->entity);
+				$sql .= ' WHERE entity = '.((int) $object->entity);
 			} else {
-				$sql .= ' WHERE entity = ' . ((int) $conf->entity);
+				$sql .= ' WHERE entity = '.((int) $conf->entity);
 			}
 			$sql .= " AND filepath = '".$db->escape($rel_dir)."'";
 			if ($file) {
@@ -2615,9 +2615,9 @@ 
 					// Skip directories (they would be added automatically)
 					if (!$file->isDir()) {
 						// Get real and relative path for current file
-						$filePath = $file->getPath();				// the full path with filename using the $inputdir root.
+						$filePath = $file->getPath(); // the full path with filename using the $inputdir root.
 						$fileName = $file->getFilename();
-						$fileFullRealPath = $file->getRealPath();	// the full path with name and transformed to use real path directory.
+						$fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory.
 
 						//$relativePath = substr($fileFullRealPath, strlen($rootPath) + 1);
 						$relativePath = substr(($filePath ? $filePath.'/' : '').$fileName, strlen($rootPath) + 1);
@@ -2889,9 +2889,9 @@ 
 					// Skip directories (they would be added automatically)
 					if (!$file->isDir()) {
 						// Get real and relative path for current file
-						$filePath = $file->getPath();				// the full path with filename using the $inputdir root.
+						$filePath = $file->getPath(); // the full path with filename using the $inputdir root.
 						$fileName = $file->getFilename();
-						$fileFullRealPath = $file->getRealPath();	// the full path with name and transformed to use real path directory.
+						$fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory.
 
 						//$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($fileFullRealPath, strlen($inputdir) + 1);
 						$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr(($filePath ? $filePath.'/' : '').$fileName, strlen($inputdir) + 1);
@@ -3485,7 +3485,7 @@ 
 		if ($fuser->hasRight('fournisseur', 'facture', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
-		$original_file = preg_replace("/payment\//", "", $original_file);	// Because the $conf->fournisseur->payment->dir_output already contains the "payment/"
+		$original_file = preg_replace("/payment\//", "", $original_file); // Because the $conf->fournisseur->payment->dir_output already contains the "payment/"
 		$original_file = $conf->fournisseur->payment->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	} elseif ($modulepart == 'payment') {
@@ -3653,17 +3653,17 @@ 
 			$email_split = explode('@', $_SESSION['email_customer']);
 
 			$sqlprotectagainstexternals = 'SELECT t.rowid, t.fk_soc FROM '.MAIN_DB_PREFIX.'ticket t';
-			$sqlprotectagainstexternals.= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id = t.rowid';
-			$sqlprotectagainstexternals.= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople c ON c.rowid = ec.fk_socpeople';
-			$sqlprotectagainstexternals.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_contact tc ON tc.element = "ticket" AND tc.rowid = ec.fk_c_type_contact';
-			$sqlprotectagainstexternals.= ' WHERE t.ref LIKE "'.$db->sanitize($refname).'"';
-			$sqlprotectagainstexternals.= ' AND (';
-			$sqlprotectagainstexternals.= '   (';
-			$sqlprotectagainstexternals.= '     tc.rowid IS NOT NULL';
-			$sqlprotectagainstexternals.= '     AND c.email = "'.$db->sanitize($email_split[0]).'@'.$db->sanitize($email_split[1]).'"';
-			$sqlprotectagainstexternals.= '   )';
-			$sqlprotectagainstexternals.= '   OR t.origin_email = "'.$db->sanitize($email_split[0]).'@'.$db->sanitize($email_split[1]).'"';
-			$sqlprotectagainstexternals.= ' )';
+			$sqlprotectagainstexternals .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id = t.rowid';
+			$sqlprotectagainstexternals .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople c ON c.rowid = ec.fk_socpeople';
+			$sqlprotectagainstexternals .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_contact tc ON tc.element = "ticket" AND tc.rowid = ec.fk_c_type_contact';
+			$sqlprotectagainstexternals .= ' WHERE t.ref LIKE "'.$db->sanitize($refname).'"';
+			$sqlprotectagainstexternals .= ' AND (';
+			$sqlprotectagainstexternals .= '   (';
+			$sqlprotectagainstexternals .= '     tc.rowid IS NOT NULL';
+			$sqlprotectagainstexternals .= '     AND c.email = "'.$db->sanitize($email_split[0]).'@'.$db->sanitize($email_split[1]).'"';
+			$sqlprotectagainstexternals .= '   )';
+			$sqlprotectagainstexternals .= '   OR t.origin_email = "'.$db->sanitize($email_split[0]).'@'.$db->sanitize($email_split[1]).'"';
+			$sqlprotectagainstexternals .= ' )';
 		}
 		$original_file = $conf->ticket->multidir_output[$entity].'/'.$original_file;
 		// If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
@@ -4034,7 +4034,7 @@ 
 function archiveOrBackupFile($srcfile, $max_versions = 5, $archivedir = '', $suffix = "v", $moveorcopy = 'move')
 {
 	$base_file_pattern = ($archivedir ? $archivedir : dirname($srcfile)).'/'.basename($srcfile).".".$suffix;
-	$files_in_directory = glob($base_file_pattern . "*");
+	$files_in_directory = glob($base_file_pattern."*");
 
 	// Extract the modification timestamps for each file
 	$files_with_timestamps = [];
@@ -4075,7 +4075,7 @@ 
 	}
 
 	$timestamp = dol_now('gmt');
-	$new_backup = $srcfile . ".v" . $timestamp;
+	$new_backup = $srcfile.".v".$timestamp;
 
 	// Move or copy the original file to the new backup with the timestamp
 	if ($moveorcopy == 'move') {