From f1e876d9bdc3722fa962c5f0b61a47b4922a65c6 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Sun, 25 May 2003 17:47:31 +0000
Subject: [PATCH] =?UTF-8?q?Mise=20=E0=20jour=20des=20noms=20de=20tables?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/propal.php3 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/propal.php3 b/htdocs/compta/propal.php3
index 7d27c17d238..be0e67884ce 100644
--- a/htdocs/compta/propal.php3
+++ b/htdocs/compta/propal.php3
@@ -68,14 +68,15 @@ if ($action == 'setstatut') {
  *
  *
  */
-if ($propalid) {
+if ($propalid)
+{
   $propal = new Propal($db);
   $propal->fetch($propalid);
 
-
-  if ($valid == 1) {
-    $propal->valid($user->id);
-  }
+  if ($valid == 1)
+    {
+      $propal->valid($user->id);
+    }
   /*
    *
    */
@@ -86,7 +87,7 @@ if ($propalid) {
    *
    */
   $sql = "SELECT s.nom, s.idp, p.price, p.fk_projet,p.remise, p.tva, p.total, p.ref,".$db->pdate("p.datep")." as dp, c.id as statut, c.label as lst, p.note, x.firstname, x.name, x.fax, x.phone, x.email, p.fk_user_author, p.fk_user_valid, p.fk_user_cloture, p.datec, p.date_valid, p.date_cloture";
-  $sql .= " FROM societe as s, llx_propal as p, c_propalst as c, socpeople as x";
+  $sql .= " FROM llx_societe as s, llx_propal as p, c_propalst as c, llx_socpeople as x";
   $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND x.idp = p.fk_soc_contact AND p.rowid = $propalid";
 
   $result = $db->query($sql);
@@ -329,7 +330,7 @@ if ($propalid) {
   print "</table>";
 
   $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price - p.remise as price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid";
-  $sql .= " FROM societe as s, llx_propal as p, c_propalst as c ";
+  $sql .= " FROM llx_societe as s, llx_propal as p, c_propalst as c ";
   $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND p.fk_statut in(2,4)";
 
   if ($socidp) {