Dolibarr / dolibarr

htdocs/filefunc.inc.php

Spacing +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
 		if ($csrfattack) {
 			//print 'NOCSRFCHECK='.defined('NOCSRFCHECK').' REQUEST_METHOD='.$_SERVER['REQUEST_METHOD'].' HTTP_HOST='.$_SERVER['HTTP_HOST'].' HTTP_REFERER='.$_SERVER['HTTP_REFERER'];
 			// Note: We can't use dol_escape_htmltag here to escape output because lib functions.lib.ph is not yet loaded.
-			dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"])?'':$_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (Bad referer).", LOG_WARNING);
+			dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (Bad referer).", LOG_WARNING);
 			print "Access refused by CSRF protection in main.inc.php. Referer of form (".htmlentities($_SERVER['HTTP_REFERER'], ENT_COMPAT, 'UTF-8').") is outside the server that serve this page (with method = ".htmlentities($_SERVER['REQUEST_METHOD'], ENT_COMPAT, 'UTF-8').").\n";
 			print "If you access your server behind a proxy using url rewriting, you might check that all HTTP headers are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file to remove this security check).\n";
 			die;

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

Spacing +207 added lines, -207 removed lines

@@ -270,7 +270,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;
@@ -332,32 +332,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;
@@ -493,46 +493,46 @@ 
 		$error = 0;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_rec SET";
-		$sql .= " titre = '" . (!empty($this->title) ? $this->db->escape($this->title) : "")."'," ;
-		$sql .= " ref_supplier = '". (!empty($this->ref_supplier) ? $this->db->escape($this->ref_supplier) : "")."',";
-		$sql .= " entity = ". (!empty($this->entity) ? ((int) $this->entity) : 1) . ',';
+		$sql .= " titre = '".(!empty($this->title) ? $this->db->escape($this->title) : "")."',";
+		$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;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -591,7 +591,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 {
@@ -724,7 +724,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);
@@ -764,7 +764,7 @@ 
 				$line->product_type             = $objp->product_type;
 				$line->date_start               = $objp->date_start;
 				$line->date_end                 = $objp->date_end;
-				$line->info_bits                = $objp->info_bits	;
+				$line->info_bits                = $objp->info_bits;
 				$line->special_code             = $objp->special_code;
 				$line->rang                     = $objp->rang;
 				$line->fk_unit                  = $objp->fk_unit;
@@ -814,11 +814,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
@@ -847,7 +847,7 @@ 
 			}
 			// End call triggers
 		}
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -959,7 +959,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';
@@ -991,46 +991,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 invoie id
-			$sql .= ', ' . (!empty($fk_product) ? "'" . $this->db->escape($fk_product) . "'" : 'null');
-			$sql .= ', ' . (!empty($ref) ? "'" . $this->db->escape($ref) . "'" : 'null');
-			$sql .= ', ' . (!empty($label) ? "'" . $this->db->escape($label) . "'" : 'null');
-			$sql .= ", '" . $this->db->escape($desc) . "'";
-			$sql .= ', ' . price2num($pu_ht);
-			$sql .= ', ' . price2num($pu_ttc);
-			$sql .= ', ' . price2num($qty);
-			$sql .= ', ' . price2num($remise_percent);
+			$sql .= ' '.(int) $facid; // source supplier invoie id
+			$sql .= ', '.(!empty($fk_product) ? "'".$this->db->escape($fk_product)."'" : 'null');
+			$sql .= ', '.(!empty($ref) ? "'".$this->db->escape($ref)."'" : 'null');
+			$sql .= ', '.(!empty($label) ? "'".$this->db->escape($label)."'" : 'null');
+			$sql .= ", '".$this->db->escape($desc)."'";
+			$sql .= ', '.price2num($pu_ht);
+			$sql .= ', '.price2num($pu_ttc);
+			$sql .= ', '.price2num($qty);
+			$sql .= ', '.price2num($remise_percent);
 			$sql .= ', null';
-			$sql .= ", '" . $this->db->escape($vat_src_code) . "'";
-			$sql .= ', ' . price2num($txtva);
-			$sql .= ', ' . price2num($txlocaltax1);
-			$sql .= ", '" . $this->db->escape(isset($localtaxes_type[0]) ? $localtaxes_type[0] : '') . "'";
-			$sql .= ', ' . price2num($txlocaltax2);
-			$sql .= ", '" . $this->db->escape(isset($localtaxes_type[2]) ? $localtaxes_type[2] : '') . "'";
-			$sql .= ', ' . price2num($total_ht);
-			$sql .= ', ' . price2num($total_tva);
-			$sql .= ', ' . price2num($total_localtax1);
-			$sql .= ', ' . price2num($total_localtax2);
-			$sql .= ', ' . price2num($total_ttc);
-			$sql .= ', ' . (int) $product_type;
-			$sql .= ', ' . ($date_start > 0 ? (int) $date_start : 'NULL');
-			$sql .= ', ' . ($date_end > 0 ? (int) $date_end : 'NULL');
-			$sql .= ', ' . (int) $info_bits;
-			$sql .= ', ' . (int) $special_code;
-			$sql .= ', ' . (int) $rang;
-			$sql .= ', ' . ($fk_unit ? (int) $fk_unit : 'NULL');
-			$sql .= ', ' . (int) $user->id;
-			$sql .= ', ' . (int) $this->fk_multicurrency;
-			$sql .= ", '" . $this->db->escape($this->multicurrency_code) . "'";
-			$sql .= ', ' . price2num($pu_ht_devise, 'CU');
-			$sql .= ', ' . price2num($multicurrency_total_ht, 'CT');
-			$sql .= ', ' . price2num($multicurrency_total_tva, 'CT');
-			$sql .= ', ' . price2num($multicurrency_total_ttc, 'CT');
+			$sql .= ", '".$this->db->escape($vat_src_code)."'";
+			$sql .= ', '.price2num($txtva);
+			$sql .= ', '.price2num($txlocaltax1);
+			$sql .= ", '".$this->db->escape(isset($localtaxes_type[0]) ? $localtaxes_type[0] : '')."'";
+			$sql .= ', '.price2num($txlocaltax2);
+			$sql .= ", '".$this->db->escape(isset($localtaxes_type[2]) ? $localtaxes_type[2] : '')."'";
+			$sql .= ', '.price2num($total_ht);
+			$sql .= ', '.price2num($total_tva);
+			$sql .= ', '.price2num($total_localtax1);
+			$sql .= ', '.price2num($total_localtax2);
+			$sql .= ', '.price2num($total_ttc);
+			$sql .= ', '.(int) $product_type;
+			$sql .= ', '.($date_start > 0 ? (int) $date_start : 'NULL');
+			$sql .= ', '.($date_end > 0 ? (int) $date_end : 'NULL');
+			$sql .= ', '.(int) $info_bits;
+			$sql .= ', '.(int) $special_code;
+			$sql .= ', '.(int) $rang;
+			$sql .= ', '.($fk_unit ? (int) $fk_unit : 'NULL');
+			$sql .= ', '.(int) $user->id;
+			$sql .= ', '.(int) $this->fk_multicurrency;
+			$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+			$sql .= ', '.price2num($pu_ht_devise, 'CU');
+			$sql .= ', '.price2num($multicurrency_total_ht, 'CT');
+			$sql .= ', '.price2num($multicurrency_total_tva, 'CT');
+			$sql .= ', '.price2num($multicurrency_total_ttc, 'CT');
 			$sql .= ')';
 
-			dol_syslog(get_class($this). '::addline', LOG_DEBUG);
+			dol_syslog(get_class($this).'::addline', LOG_DEBUG);
 			if ($this->db->query($sql)) {
-				$lineId = $this->db->last_insert_id(MAIN_DB_PREFIX. 'facture_fourn_det_rec');
+				$lineId = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det_rec');
 				$this->update_price();
 				$this->id = $facid;
 				$this->db->commit();
@@ -1081,7 +1081,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
@@ -1152,41 +1152,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();
@@ -1275,16 +1275,16 @@ 
 		$tmparray = dol_getdate($now);
 		$today = dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year']); // Today is last second of current day
 
-		dol_syslog('createRecurringInvoices restrictioninvoiceid=' .$restrictioninvoiceid. ' forcevalidation=' .$forcevalidation);
+		dol_syslog('createRecurringInvoices restrictioninvoiceid='.$restrictioninvoiceid.' forcevalidation='.$forcevalidation);
 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_fourn_rec';
 		$sql .= ' WHERE frequency > 0'; // A recurring supplier invoice is an invoice with a frequency
 		$sql .= " AND (date_when IS NULL OR date_when <= '".$this->db->idate($today)."')";
 		$sql .= ' AND (nb_gen_done < nb_gen_max OR nb_gen_max = 0)';
 		$sql .= ' AND suspended = 0';
-		$sql .= ' AND entity = '. (int) $conf->entity; // MUST STAY = $conf->entity here
+		$sql .= ' AND entity = '.(int) $conf->entity; // MUST STAY = $conf->entity here
 		if ($restrictioninvoiceid > 0) {
-			$sql .= ' AND rowid = '. (int) $restrictioninvoiceid;
+			$sql .= ' AND rowid = '.(int) $restrictioninvoiceid;
 		}
 		$sql .= $this->db->order('entity', 'ASC');
 		//print $sql;exit;
@@ -1306,7 +1306,7 @@ 
 			}
 
 			$saventity = $conf->entity;
-			$laststep="None";
+			$laststep = "None";
 
 			while ($i < $num) {     // Loop on each template invoice. If $num = 0, test is false at first pass.
 				$line = $this->db->fetch_object($resql);
@@ -1317,21 +1317,21 @@ 
 
 				$new_fac_fourn = null;
 				$facturerec = new FactureFournisseurRec($this->db);
-				$laststep="Fetch {$line->rowid}";
+				$laststep = "Fetch {$line->rowid}";
 				$facturerec->fetch($line->rowid);
 
 				if ($facturerec->id > 0) {
 					// 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
 					$new_fac_fourn->fk_fac_rec_source = $facturerec->id; // We will create $facture from this recurring invoice
 
 					$new_fac_fourn->type = self::TYPE_STANDARD;
-					$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;
@@ -1340,10 +1340,10 @@ 
 					$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";
+					$laststep = "Create invoiceidgenerated $invoiceidgenerated";
 					if ($invoiceidgenerated <= 0) {
 						$this->errors = $new_fac_fourn->errors;
 						$this->error = $new_fac_fourn->error;
@@ -1351,7 +1351,7 @@ 
 					}
 					if (!$error && ($facturerec->auto_validate || $forcevalidation)) {
 						$result = $new_fac_fourn->validate($user);
-						$laststep="Validate by user $user";
+						$laststep = "Validate by user $user";
 						if ($result <= 0) {
 							$this->errors = $new_fac_fourn->errors;
 							$this->error = $new_fac_fourn->error;
@@ -1361,9 +1361,9 @@ 
 
 					if (!$error && $facturerec->generate_pdf) {
 						// We refresh the object in order to have all necessary data (like date_lim_reglement)
-						$laststep="Refresh {$new_fac_fourn->id}";
+						$laststep = "Refresh {$new_fac_fourn->id}";
 						$new_fac_fourn->fetch($new_fac_fourn->id);
-						$laststep="GenerateDocument {$new_fac_fourn->id}";
+						$laststep = "GenerateDocument {$new_fac_fourn->id}";
 						$result = $new_fac_fourn->generateDocument($facturerec->model_pdf, $langs);
 						if ($result < 0) {
 							$this->errors = $new_fac_fourn->errors;
@@ -1373,22 +1373,22 @@ 
 					}
 				} 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) {
 					$facturerec->nb_gen_done++;
 					$facturerec->date_last_gen = dol_now();
-					$facturerec->date_when= $facturerec->getNextDate();
+					$facturerec->date_when = $facturerec->getNextDate();
 					$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(
@@ -1481,7 +1481,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) {
@@ -1660,8 +1660,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);
@@ -1700,7 +1700,7 @@ 
 			$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;
@@ -1747,7 +1747,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;
@@ -1794,12 +1794,12 @@ 
 	public function setFrequencyAndUnit($frequency, $unit)
 	{
 		if (!$this->table_element) {
-			dol_syslog(get_class($this). '::setFrequencyAndUnit was called on objet with property table_element not defined', LOG_ERR);
+			dol_syslog(get_class($this).'::setFrequencyAndUnit was called on objet with property table_element not defined', LOG_ERR);
 			return -1;
 		}
 
 		if (!empty($frequency) && empty($unit)) {
-			dol_syslog(get_class($this). '::setFrequencyAndUnit was called on objet with params frequency defined but unit not defined', LOG_ERR);
+			dol_syslog(get_class($this).'::setFrequencyAndUnit was called on objet with params frequency defined but unit not defined', LOG_ERR);
 			return -2;
 		}
 
@@ -1838,11 +1838,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);
 
@@ -1876,8 +1876,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);
 
@@ -1905,7 +1905,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);
 
@@ -1932,8 +1932,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);
 
@@ -1961,7 +1961,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);
 
@@ -2034,8 +2034,8 @@ 
 		$error = 0;
 		$this->db->begin();
 
-		if (! $error) {
-			if (! $notrigger) {
+		if (!$error) {
+			if (!$notrigger) {
 				// Call triggers
 				$result = $this->call_trigger('LINESUPPLIERBILLREC_DELETE', $user);
 				if ($result < 0) {
@@ -2045,15 +2045,15 @@ 
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$result = $this->deleteExtraFields();
 			if ($result < 0) {
 				$error++;
 			}
 		}
 
-		if (! $error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element . ' WHERE rowid=' . (int) $this->id;
+		if (!$error) {
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.(int) $this->id;
 
 			$res = $this->db->query($sql);
 			if ($res === false) {
@@ -2093,7 +2093,7 @@ 
 		$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det_rec as l';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-		$sql .= ' WHERE l.rowid = '. (int) $rowid;
+		$sql .= ' WHERE l.rowid = '.(int) $rowid;
 		$sql .= ' ORDER BY l.rang';
 
 		dol_syslog('FactureRec::fetch', LOG_DEBUG);
@@ -2165,44 +2165,44 @@ 
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facture_fourn_det_rec SET';
-		$sql .= ' fk_facture_fourn = ' . (int) $this->fk_facture_fourn;
-		$sql .= ', fk_parent_line = ' . (int) $this->fk_parent;
-		$sql .= ', fk_product = ' . (int) $this->fk_product;
-		$sql .= ', ref = ' . (!empty($this->ref) ? "'" . $this->db->escape($this->ref) . "'" : 'NULL');
-		$sql .= ", label = " . (!empty($this->label) ? "'" . $this->db->escape($this->label) . "'" : 'NULL');
-		$sql .= ", description = '" . $this->db->escape($this->description) . "'";
-		$sql .= ', pu_ht = ' . price2num($this->pu_ht);
-		$sql .= ', pu_ttc = ' . price2num($this->pu_ttc);
-		$sql .= ', qty = ' . price2num($this->qty);
-		$sql .= ", remise_percent = '" . price2num($this->remise_percent) . "'";
-		$sql .= ', fk_remise_except = ' . (int) $this->fk_remise_except;
-		$sql .= ", vat_src_code = '" . $this->db->escape($this->vat_src_code) . "'";
-		$sql .= ', tva_tx = ' . price2num($this->tva_tx);
-		$sql .= ', localtax1_tx = ' . price2num($this->localtax1_tx);
-		$sql .= ", localtax1_type = '" . $this->db->escape($this->localtax1_type) . "'";
-		$sql .= ', localtax2_tx = ' . price2num($this->localtax2_tx);
-		$sql .= ", localtax2_type = '" . $this->db->escape($this->localtax2_type) . "'";
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn_det_rec SET';
+		$sql .= ' fk_facture_fourn = '.(int) $this->fk_facture_fourn;
+		$sql .= ', fk_parent_line = '.(int) $this->fk_parent;
+		$sql .= ', fk_product = '.(int) $this->fk_product;
+		$sql .= ', ref = '.(!empty($this->ref) ? "'".$this->db->escape($this->ref)."'" : 'NULL');
+		$sql .= ", label = ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : 'NULL');
+		$sql .= ", description = '".$this->db->escape($this->description)."'";
+		$sql .= ', pu_ht = '.price2num($this->pu_ht);
+		$sql .= ', pu_ttc = '.price2num($this->pu_ttc);
+		$sql .= ', qty = '.price2num($this->qty);
+		$sql .= ", remise_percent = '".price2num($this->remise_percent)."'";
+		$sql .= ', fk_remise_except = '.(int) $this->fk_remise_except;
+		$sql .= ", vat_src_code = '".$this->db->escape($this->vat_src_code)."'";
+		$sql .= ', tva_tx = '.price2num($this->tva_tx);
+		$sql .= ', localtax1_tx = '.price2num($this->localtax1_tx);
+		$sql .= ", localtax1_type = '".$this->db->escape($this->localtax1_type)."'";
+		$sql .= ', localtax2_tx = '.price2num($this->localtax2_tx);
+		$sql .= ", localtax2_type = '".$this->db->escape($this->localtax2_type)."'";
 		if (empty($this->skip_update_total)) {
-			$sql .= ', total_ht = ' . price2num($this->total_ht);
-			$sql .= ', total_tva = ' . price2num($this->total_tva);
-			$sql .= ', total_localtax1 = ' . price2num($this->total_localtax1);
-			$sql .= ', total_localtax2 = ' . price2num($this->total_localtax2);
-			$sql .= ', total_ttc = ' . price2num($this->total_ttc);
+			$sql .= ', total_ht = '.price2num($this->total_ht);
+			$sql .= ', total_tva = '.price2num($this->total_tva);
+			$sql .= ', total_localtax1 = '.price2num($this->total_localtax1);
+			$sql .= ', total_localtax2 = '.price2num($this->total_localtax2);
+			$sql .= ', total_ttc = '.price2num($this->total_ttc);
 		}
-		$sql .= ', product_type = ' . (int) $this->product_type;
-		$sql .= ', date_start = ' . (int) $this->date_start;
-		$sql .= ', date_end = ' . (int) $this->date_end;
-		$sql .= ", info_bits = " . ((int) $this->info_bits);
-		$sql .= ', special_code =' . (int) $this->special_code;
-		$sql .= ', rang = ' . (int) $this->rang;
-		$sql .= ', fk_unit = ' .($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : 'null');
-		$sql .= ', fk_user_modif = ' . (int) $user;
-		$sql .= ' WHERE rowid = ' . (int) $this->id;
+		$sql .= ', product_type = '.(int) $this->product_type;
+		$sql .= ', date_start = '.(int) $this->date_start;
+		$sql .= ', date_end = '.(int) $this->date_end;
+		$sql .= ", info_bits = ".((int) $this->info_bits);
+		$sql .= ', special_code ='.(int) $this->special_code;
+		$sql .= ', rang = '.(int) $this->rang;
+		$sql .= ', fk_unit = '.($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : 'null');
+		$sql .= ', fk_user_modif = '.(int) $user;
+		$sql .= ' WHERE rowid = '.(int) $this->id;
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this). '::updateline', LOG_DEBUG);
+		dol_syslog(get_class($this).'::updateline', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if (!$error) {