From ed3023f7d990175f70401f771b0b8fcdf60224b6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 10 Jul 2018 11:09:08 +0200 Subject: [PATCH] Update propal.class.php --- htdocs/comm/propal/class/propal.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 44d7c7ea1b4..c5ec7e75955 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -3939,14 +3939,14 @@ class PropaleLigne extends CommonObjectLine $sql.= " ".price2num($this->localtax2_tx).","; $sql.= " '".$this->db->escape($this->localtax1_type)."',"; $sql.= " '".$this->db->escape($this->localtax2_type)."',"; - $sql.= " ".(is_numeric($this->subprice)?price2num($this->subprice):"null").","; + $sql.= " ".(price2num($this->subprice)!==''?price2num($this->subprice):"null").","; $sql.= " ".price2num($this->remise_percent).","; $sql.= " ".(isset($this->info_bits)?"'".$this->db->escape($this->info_bits)."'":"null").","; - $sql.= " ".price2num($this->total_ht).","; - $sql.= " ".price2num($this->total_tva).","; - $sql.= " ".price2num($this->total_localtax1).","; - $sql.= " ".price2num($this->total_localtax2).","; - $sql.= " ".price2num($this->total_ttc).","; + $sql.= " ".(price2num($this->total_ht)!==''?price2num($this->total_ht):"null").","; + $sql.= " ".(price2num($this->total_tva)!==''?price2num($this->total_tva):"null").","; + $sql.= " ".(price2num($this->tottotal_localtax1al_ht)!==''?price2num($this->total_localtax1):"null").","; + $sql.= " ".(price2num($this->total_localtax2)!==''?price2num($this->total_localtax2):"null").","; + $sql.= " ".(price2num($this->total_ttc)!==''?price2num($this->total_ttc):"null").","; $sql.= " ".(!empty($this->fk_fournprice)?"'".$this->db->escape($this->fk_fournprice)."'":"null").","; $sql.= " ".(isset($this->pa_ht)?"'".price2num($this->pa_ht)."'":"null").","; $sql.= ' '.$this->special_code.',';