diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index a8d6c4b1ce8..2afae5a2182 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.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 @@ -115,7 +116,7 @@ if ($mode == 'search') { if ($mode-search == 'soc') { - $sql = "SELECT s.idp FROM llx_societe as s "; + $sql = "SELECT s.idp FROM ".MAIN_DB_PREFIX."societe as s "; $sql .= " WHERE lower(s.nom) like '%".strtolower($socname)."%'"; } @@ -239,7 +240,7 @@ if ($socid > 0) print ''; $var=!$var; $sql = "SELECT s.nom, s.idp, f.facnumber, f.amount, ".$db->pdate("f.datef")." as df, f.paye, f.rowid as facid "; - $sql .= " FROM llx_societe as s,llx_facture as f WHERE f.fk_soc = s.idp AND s.idp = ".$objsoc->idp." ORDER BY f.datef DESC"; + $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.idp AND s.idp = ".$objsoc->idp." ORDER BY f.datef DESC"; if ( $db->query($sql) ) { @@ -287,7 +288,7 @@ if ($socid > 0) * */ $sql = "SELECT p.rowid,p.title,p.ref,".$db->pdate("p.dateo")." as do"; - $sql .= " FROM llx_projet as p WHERE p.fk_soc = $objsoc->idp"; + $sql .= " FROM ".MAIN_DB_PREFIX."projet as p WHERE p.fk_soc = $objsoc->idp"; if ( $db->query($sql) ) { print "
"; $i = 0 ; @@ -348,7 +349,7 @@ if ($socid > 0) print ""; print ""; - $sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note FROM llx_socpeople as p WHERE p.fk_soc = $objsoc->idp ORDER by p.datec"; + $sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note FROM ".MAIN_DB_PREFIX."socpeople as p WHERE p.fk_soc = $objsoc->idp ORDER by p.datec"; $result = $db->query($sql); $i = 0 ; $num = $db->num_rows(); diff --git a/htdocs/societe.php b/htdocs/societe.php index bfd6cf0892b..fa0f6297661 100644 --- a/htdocs/societe.php +++ b/htdocs/societe.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 @@ -56,7 +57,7 @@ $pagenext = $page + 1; */ if ($mode == 'search') { if ($mode-search == 'soc') { - $sql = "SELECT s.idp FROM llx_societe as s "; + $sql = "SELECT s.idp FROM ".MAIN_DB_PREFIX."societe as s "; $sql .= " WHERE lower(s.nom) like '%".strtolower($socname)."%'"; } @@ -79,7 +80,7 @@ if ($mode == 'search') { print_barre_liste("Liste des societes", $page, $PHP_SELF); $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, s.client, s.fournisseur"; -$sql .= " FROM llx_societe as s, c_stcomm as st WHERE s.fk_stcomm = st.id"; +$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st WHERE s.fk_stcomm = st.id"; if ($user->societe_id > 0) { $sql .= " AND s.idp = " . $user->societe_id;
FaxEmailidp&action=addcontact\">Ajouter