From c6cac723625469cd05bf5a18b633b0ebb8f74873 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 13 Feb 2006 18:59:06 +0000
Subject: [PATCH] bugfix : mauvais appel en base

---
 htdocs/commande/apercu.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
index 253e154ff75..0ab4419c827 100644
--- a/htdocs/commande/apercu.php
+++ b/htdocs/commande/apercu.php
@@ -120,11 +120,13 @@ if ($_GET["id"] > 0) {
 		/*
 		*   Commande
 		*/
-/*		
+		
 		$sql = 'SELECT s.nom, s.idp, c.amount_ht, c.fk_projet, c.remise, c.tva, c.total_ttc, c.ref, c.fk_statut, '.$db->pdate('c.date_commande').' as dp, c.note,';
 		$sql.= ' x.firstname, x.name, x.fax, x.phone, x.email, c.fk_user_author, c.fk_user_valid, c.fk_user_cloture, c.date_creation, c.date_valid, c.date_cloture';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande as c, '.MAIN_DB_PREFIX.'socpeople as x';
-		$sql.= ' WHERE c.fk_soc = s.idp AND c.fk_soc_contact = x.idp AND c.rowid = '.$commande->id;
+		$sql.= ' WHERE c.fk_soc = s.idp';
+		//$sql.= ' AND c.fk_soc_contact = x.idp'; //le champs fk_soc_contact est vide dans la base llx_commande
+		$sql.= ' AND c.rowid = '.$commande->id;
 		if ($socidp) $sql .= ' AND s.idp = '.$socidp;
 
 		$result = $db->query($sql);
@@ -135,7 +137,7 @@ if ($_GET["id"] > 0) {
 		if ($result) {
 			if ($db->num_rows($result)) {
 				$obj = $db->fetch_object($result);
-*/
+
 				$societe = new Societe($db);
 				$societe->fetch($obj->idp);
 
@@ -289,10 +291,10 @@ if ($_GET["id"] > 0) {
 				print '<td align="right" colspan="2"><b>'.price($commande->price).'</b></td>';
 				print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
 				print '</table>';
-/*			}
+			}
 		} else {
 			dolibarr_print_error($db);
-		}*/
+		}
 	} else {
 	// Commande non trouvée
 	print $langs->trans("ErrorPropalNotFound",$_GET["id"]);