From d29639e0ce16ac4fb793df78f9c2554149532341 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 30 Jan 2004 23:46:51 +0000 Subject: [PATCH] =?UTF-8?q?Prefix=20en=20dur=20"llx=5F"=20remplac=E9=20par?= =?UTF-8?q?=20constante=20"MAIN=5FDB=5FPREFIX".?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/action/index.php | 2 +- htdocs/comm/clients.php | 3 ++- htdocs/comm/contact.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index fc6c9f72a4e..ed72249c6d6 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -127,7 +127,7 @@ if ($sortfield == "") } $sql = "SELECT s.nom as societe, s.idp as socidp,a.id,".$db->pdate("a.datea")." as da, a.datea, c.libelle, u.code, a.fk_contact, a.note, a.percent as percent"; -$sql .= " FROM llx_actioncomm as a, c_actioncomm as c, llx_societe as s, llx_user as u"; +$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."user as u"; $sql .= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.rowid"; if ($type) diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php index 67cfcfc028e..de3db253bba 100644 --- a/htdocs/comm/clients.php +++ b/htdocs/comm/clients.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,7 +49,7 @@ $pagenext = $page + 1; * */ -$sql = "SELECT s.idp, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, st.libelle as stcomm, s.prefix_comm FROM llx_societe as s, c_stcomm as st WHERE s.fk_stcomm = st.id AND s.client=1"; +$sql = "SELECT s.idp, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, st.libelle as stcomm, s.prefix_comm FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st WHERE s.fk_stcomm = st.id AND s.client=1"; if (strlen($stcomm)) { diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 8b31a20fc76..c834c8227fc 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -64,7 +64,7 @@ if ($type == "f") { */ $sql = "SELECT s.idp, s.nom, st.libelle as stcomm, p.idp as cidp, p.name, p.firstname, p.email, p.phone "; -$sql .= " FROM llx_societe as s, llx_socpeople as p, c_stcomm as st"; +$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."socpeople as p, ".MAIN_DB_PREFIX."c_stcomm as st"; $sql .= " WHERE s.fk_stcomm = st.id AND s.idp = p.fk_soc"; if ($type == "c") {