From 67a7b0b0ed2acd3e7aa52f73db8e3f04965c95a4 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Mon, 8 Sep 2003 10:59:50 +0000
Subject: [PATCH] Consolidation du code

---
 htdocs/propal.class.php3 | 48 ++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/htdocs/propal.class.php3 b/htdocs/propal.class.php3
index 4808f5c2a2d..f45afe16c84 100644
--- a/htdocs/propal.class.php3
+++ b/htdocs/propal.class.php3
@@ -72,21 +72,27 @@ class Propal
       if ($this->statut == 0)
 	{
 	  $prod = new Product($this->db, $idproduct);
-	  $prod->fetch($idproduct);
-	  
-	  $sql = "INSERT INTO llx_propaldet (fk_propal, fk_product, qty, price, tva_tx, description) VALUES ";
-	  $sql .= " (".$this->id.",". $idproduct.",". $qty.",". $prod->price.",".$prod->tva_tx.",'".$prod->label."') ; ";
-	  
-	  if ($this->db->query($sql) )
+	  if ($prod->fetch($idproduct) > 0)
 	    {
-	      
-	      $this->update_price($this->id);
-	      
-	      return 1;
+	  
+	      $sql = "INSERT INTO llx_propaldet (fk_propal, fk_product, qty, price, tva_tx, description) VALUES ";
+	      $sql .= " (".$this->id.",". $idproduct.",". $qty.",". $prod->price.",".$prod->tva_tx.",'".$prod->label."') ; ";
+	  
+	      if ($this->db->query($sql) )
+		{
+		  
+		  $this->update_price($this->id);
+		  
+		  return 1;
+		}
+	      else
+		{
+		  return -1;
+		}
 	    }
 	  else
 	    {
-	      return 0;
+	      return -2;
 	    }
 	}
     }
@@ -105,15 +111,20 @@ class Propal
 	  if ($this->db->query($sql) )
 	    {
 	      
-	      $this->update_price($this->id);
-	      
-	      return 1;
+	      if ($this->update_price($this->id) > 0)
+		{	      
+		  return 1;
+		}
+	      else
+		{
+		  return -1;
+		}
 	    }
 	  else
 	    {
 	      print $this->db->error();
 	      print "<br>".$sql;
-	      return 0;
+	      return -2;
 	    }
 	}
     }
@@ -276,9 +287,14 @@ class Propal
 	       *
 	       */
 	      $sql = "UPDATE llx_propal set price=$totalht, tva=$totaltva, total=$totalttc, remise=$total_remise WHERE rowid = $rowid";
-	      if (! $this->db->query($sql) )
+	      if ( $this->db->query($sql) )
+		{
+		  return 1;
+		}
+	      else
 		{
 		  print "Erreur mise à jour du prix<p>".$sql;
+		  return -1;
 		}
 	    }
 	}