From 2824afa75c46a5f456ecf754ee84f2c11582f069 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 29 Jun 2018 11:25:30 +0200 Subject: [PATCH 1/7] Fix: avoid a non numeric value !! --- htdocs/core/lib/price.lib.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php index eb332b44611..fe2c1d73809 100644 --- a/htdocs/core/lib/price.lib.php +++ b/htdocs/core/lib/price.lib.php @@ -89,6 +89,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt $result=array(); // Clean parameters + if (empty($pu)) $pu=0; if (empty($info_bits)) $info_bits=0; if (empty($txtva)) $txtva=0; if (empty($seller) || ! is_object($seller)) From 964f11491fd454671f3906e317dfac826dab993e Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 30 Jun 2018 10:26:50 +0200 Subject: [PATCH 2/7] Revert "Fix: avoid a non numeric value !!" This reverts commit 2824afa75c46a5f456ecf754ee84f2c11582f069. --- htdocs/core/lib/price.lib.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php index fe2c1d73809..eb332b44611 100644 --- a/htdocs/core/lib/price.lib.php +++ b/htdocs/core/lib/price.lib.php @@ -89,7 +89,6 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt $result=array(); // Clean parameters - if (empty($pu)) $pu=0; if (empty($info_bits)) $info_bits=0; if (empty($txtva)) $txtva=0; if (empty($seller) || ! is_object($seller)) From 4925624ed9b88f1ce80b39d03a7be5daee5d0b65 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 30 Jun 2018 10:38:30 +0200 Subject: [PATCH 3/7] Fix: avoid NULL value when "subprice" is 0 --- htdocs/comm/propal/class/propal.class.php | 2 +- htdocs/commande/class/commande.class.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index bedf489467e..eb2c41ac05d 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -3939,7 +3939,7 @@ class PropaleLigne extends CommonObjectLine $sql.= " ".price2num($this->localtax2_tx).","; $sql.= " '".$this->db->escape($this->localtax1_type)."',"; $sql.= " '".$this->db->escape($this->localtax2_type)."',"; - $sql.= " ".($this->subprice?price2num($this->subprice):"null").","; + $sql.= " ".price2num($this->subprice).","; $sql.= " ".price2num($this->remise_percent).","; $sql.= " ".(isset($this->info_bits)?"'".$this->db->escape($this->info_bits)."'":"null").","; $sql.= " ".price2num($this->total_ht).","; diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index d2f1c21654e..073ad0e51de 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -4065,7 +4065,7 @@ class OrderLine extends CommonOrderLine $sql.= ' '.(! empty($this->fk_product)?$this->fk_product:"null").','; $sql.= " '".$this->db->escape($this->product_type)."',"; $sql.= " '".price2num($this->remise_percent)."',"; - $sql.= " ".($this->subprice!=''?"'".price2num($this->subprice)."'":"null").","; + $sql.= " ".price2num($this->subprice).","; $sql.= " ".($this->price!=''?"'".price2num($this->price)."'":"null").","; $sql.= " '".price2num($this->remise)."',"; $sql.= ' '.(! empty($this->fk_remise_except)?$this->fk_remise_except:"null").','; @@ -4074,11 +4074,11 @@ class OrderLine extends CommonOrderLine $sql.= ' '.(! empty($this->fk_fournprice)?$this->fk_fournprice:"null").','; $sql.= ' '.price2num($this->pa_ht).','; $sql.= " '".$this->db->escape($this->info_bits)."',"; - $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).","; + $sql.= " ".price2num($this->total_tva).","; + $sql.= " ".price2num($this->total_localtax1).","; + $sql.= " ".price2num($this->total_localtax2).","; + $sql.= " ".price2num($this->total_ttc).","; $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").','; $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null").','; $sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit); From dc7fcc009bfbdcb4e7624fce4475f41a85a0fefc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 10 Jul 2018 10:56:45 +0200 Subject: [PATCH 4/7] Update propal.class.php --- htdocs/comm/propal/class/propal.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index eb2c41ac05d..44d7c7ea1b4 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -3939,7 +3939,7 @@ class PropaleLigne extends CommonObjectLine $sql.= " ".price2num($this->localtax2_tx).","; $sql.= " '".$this->db->escape($this->localtax1_type)."',"; $sql.= " '".$this->db->escape($this->localtax2_type)."',"; - $sql.= " ".price2num($this->subprice).","; + $sql.= " ".(is_numeric($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).","; From ed3023f7d990175f70401f771b0b8fcdf60224b6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 10 Jul 2018 11:09:08 +0200 Subject: [PATCH 5/7] 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.','; From c0d6aee040266ba5783af1bc66aeccd483708ad9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 10 Jul 2018 11:10:01 +0200 Subject: [PATCH 6/7] Update propal.class.php --- htdocs/comm/propal/class/propal.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index c5ec7e75955..56567c24ee3 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -3942,11 +3942,11 @@ class PropaleLigne extends CommonObjectLine $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)!==''?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.= " ".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.= " ".(!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.','; From bda142d82d70d896570124ac888a1962b64b5677 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 10 Jul 2018 11:10:55 +0200 Subject: [PATCH 7/7] Update commande.class.php --- htdocs/commande/class/commande.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 073ad0e51de..9007490d421 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -4065,7 +4065,7 @@ class OrderLine extends CommonOrderLine $sql.= ' '.(! empty($this->fk_product)?$this->fk_product:"null").','; $sql.= " '".$this->db->escape($this->product_type)."',"; $sql.= " '".price2num($this->remise_percent)."',"; - $sql.= " ".price2num($this->subprice).","; + $sql.= " ".(price2num($this->subprice)!==''?price2num($this->subprice):"null").","; $sql.= " ".($this->price!=''?"'".price2num($this->price)."'":"null").","; $sql.= " '".price2num($this->remise)."',"; $sql.= ' '.(! empty($this->fk_remise_except)?$this->fk_remise_except:"null").',';