From 7a1c654a434a30b254ed0ed09090b93004769294 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 12 Feb 2006 14:40:34 +0000 Subject: [PATCH] bugfix --- htdocs/propal.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index 628a63c2a3c..968fc56b599 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -173,16 +173,16 @@ class Propal $price = $prod->price - $remise; } - /* if ($conf->global->CHANGE_PROD_DESC) + if ($conf->global->CHANGE_PROD_DESC) { $sql = "INSERT INTO ".MAIN_DB_PREFIX."propaldet (fk_propal, fk_product, qty, price, tva_tx, description, remise_percent, subprice) VALUES "; $sql .= " (".$this->id.",". $idproduct.",'". $qty."','". $price."','".$txtva."','".addslashes($p_product_desc)."','".price2num($remise_percent)."','".price2num($subprice)."')"; } else - {*/ + { $sql = "INSERT INTO ".MAIN_DB_PREFIX."propaldet (fk_propal, fk_product, qty, price, tva_tx, description, remise_percent, subprice) VALUES "; $sql .= " (".$this->id.",". $idproduct.",'". $qty."','". $price."','".$txtva."','".addslashes($p_desc?$p_desc:$prod->label)."','".price2num($remise_percent)."','".price2num($subprice)."')"; - // } + } if ($this->db->query($sql) ) { @@ -240,16 +240,16 @@ class Propal $price = $p_price - $remise; } - if ($conf->global->CHANGE_PROD_DESC) + /* if ($conf->global->CHANGE_PROD_DESC) { $sql = "INSERT INTO ".MAIN_DB_PREFIX."propaldet (fk_propal, fk_product, qty, price, tva_tx, description, remise_percent, subprice) VALUES "; $sql .= " (".$this->id.", 0,'". $p_qty."','". price2num($price)."','".$p_tva_tx."','".addslashes($p_product_desc)."','$remise_percent', '".price2num($subprice)."') ; "; } else - { + {*/ $sql = "INSERT INTO ".MAIN_DB_PREFIX."propaldet (fk_propal, fk_product, qty, price, tva_tx, description, remise_percent, subprice) VALUES "; $sql .= " (".$this->id.", 0,'". $p_qty."','". price2num($price)."','".$p_tva_tx."','".addslashes($p_desc)."','$remise_percent', '".price2num($subprice)."') ; "; - } + // } if ($this->db->query($sql) ) {