From fad16cf338cf32077951dcf131b5e0df3cd705a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 20 Feb 2010 18:43:19 +0000
Subject: [PATCH] Fix: Error in deleting customer order

---
 htdocs/commande/commande.class.php | 34 ++++++++++++++++++------------
 htdocs/commande/fiche.php          | 13 +++++++++---
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php
index 2d1349f2998..ee623a7d3fc 100644
--- a/htdocs/commande/commande.class.php
+++ b/htdocs/commande/commande.class.php
@@ -121,7 +121,7 @@ class Commande extends CommonObject
 		for ($i = 0 ; $i < sizeof($propal->lignes) ; $i++)
 		{
 			$line = new OrderLine($this->db);
-			
+
 			$line->libelle           = $propal->lignes[$i]->libelle;
 			$line->desc              = $propal->lignes[$i]->desc;
 			$line->price             = $propal->lignes[$i]->price;
@@ -133,7 +133,7 @@ class Commande extends CommonObject
 			$line->fk_product        = $propal->lignes[$i]->fk_product;
 			$line->info_bits         = $propal->lignes[$i]->info_bits;
 			$line->product_type      = $propal->lignes[$i]->product_type;
-			
+
 			$this->lines[$i] = $line;
 		}
 
@@ -882,7 +882,7 @@ class Commande extends CommonObject
 			$price = $prod->price;
 
 			$line=new OrderLine($this->db);
-			
+
 			$line->fk_product=$idproduct;
 			$line->desc=$prod->description;
 			$line->qty=$qty;
@@ -1067,7 +1067,7 @@ class Commande extends CommonObject
 			}
 
 			$line = new OrderLine($this->db);
-			
+
 			$line->fk_commande=$this->id;
 			$line->fk_remise_except=$remise->id;
 			$line->desc=$remise->description;   	// Description ligne
@@ -1147,7 +1147,7 @@ class Commande extends CommonObject
 				$objp = $this->db->fetch_object($result);
 
 				$line = new OrderLine($this->db);
-				
+
 				$line->rowid            = $objp->rowid;				// \deprecated
 				$line->id               = $objp->rowid;
 				$line->fk_commande      = $objp->fk_commande;
@@ -1354,10 +1354,10 @@ class Commande extends CommonObject
 
 					// Supprime ligne
 					$line = new OrderLine($this->db);
-					
+
 					$line->id = $idligne;
 					$line->fk_commande = $this->id; // On en a besoin dans les triggers
-					
+
 					$result=$line->delete($user);
 
 					if ($result > 0)
@@ -1700,7 +1700,7 @@ class Commande extends CommonObject
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET';
 			$sql.= ' ref_client = '.(empty($ref_client) ? 'NULL' : '\''.addslashes($ref_client).'\'');
 			$sql.= ' WHERE rowid = '.$this->id;
-			
+
 			if ($this->db->query($sql) )
 			{
 				$this->ref_client = $ref_client;
@@ -1866,29 +1866,35 @@ class Commande extends CommonObject
 	 */
 	function delete($user)
 	{
-		global $conf, $lang;
+		global $conf, $langs;
 
 		$err = 0;
 
 		$this->db->begin();
 
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE fk_commande = ".$this->id;
+		dol_syslog("Commande::delete sql=".$sql);
 		if (! $this->db->query($sql) )
 		{
+			dol_syslog("Commande::delete error", LOG_ERR);
 			$err++;
 		}
 
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande WHERE rowid = ".$this->id;
+		dol_syslog("Commande::delete sql=".$sql);
 		if (! $this->db->query($sql) )
 		{
+			dol_syslog("Commande::delete error", LOG_ERR);
 			$err++;
 		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element";
 		$sql.= " WHERE fk_target = ".$this->id;
-		$sql.= " AND targettype = ".$this->element;
+		$sql.= " AND targettype = '".$this->element."'";
+		dol_syslog("Commande::delete sql=".$sql);
 		if (! $this->db->query($sql) )
 		{
+			dol_syslog("Commande::delete error", LOG_ERR);
 			$err++;
 		}
 
@@ -2230,9 +2236,9 @@ class Commande extends CommonObject
 		while ($xnbp < $nbp)
 		{
 			$line=new OrderLine($this->db);
-			
+
 			$prodid = rand(1, $num_prods);
-			
+
 			$line->desc=$langs->trans("Description")." ".$xnbp;
 			$line->qty=1;
 			$line->subprice=100;
@@ -2243,10 +2249,10 @@ class Commande extends CommonObject
 			$line->total_tva=19.6;
 			$line->produit_id=$prodids[$prodid];
 			$line->fk_product=$prodids[$prodid];
-			
+
 			$this->lignes[$xnbp]=$line; // TODO: deprecated
 			$this->lines[$xnbp]=$line;
-			
+
 			$xnbp++;
 		}
 
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 581cc5360fb..6fec081f5d3 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -97,9 +97,16 @@ if ($_REQUEST['action'] == 'confirm_delete' && $_REQUEST['confirm'] == 'yes')
 	{
 		$commande = new Commande($db);
 		$commande->fetch($_GET['id']);
-		$commande->delete($user);
-		Header('Location: index.php');
-		exit;
+		$result=$commande->delete($user);
+		if ($result > 0)
+		{
+			Header('Location: index.php');
+			exit;
+		}
+		else
+		{
+			$mesg=$commande->error;
+		}
 	}
 }