From 7635e618b7053ce122edc24587b616318908057d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 30 Jan 2004 20:33:34 +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/compta/charges.php | 6 +++--- htdocs/compta/charges/index.php | 7 ++++--- htdocs/compta/clients.php | 13 +++++++------ htdocs/compta/index.php | 13 +++++++------ htdocs/compta/resultat/index.php | 9 +++++---- htdocs/compta/sociales/index.php | 5 +++-- 6 files changed, 29 insertions(+), 24 deletions(-) diff --git a/htdocs/compta/charges.php b/htdocs/compta/charges.php index 6708222e9fd..36948a9019c 100644 --- a/htdocs/compta/charges.php +++ b/htdocs/compta/charges.php @@ -38,14 +38,14 @@ function valeur($sql) { */ if ($action == 'add_bookmark') { - $sql = "INSERT INTO llx_bookmark (fk_soc, dateb, fk_user) VALUES ($socidp, now(),".$user->id.");"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES ($socidp, now(),".$user->id.");"; if (! $db->query($sql) ) { print $db->error(); } } if ($action == 'del_bookmark') { - $sql = "DELETE FROM llx_bookmark WHERE rowid=$bid"; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark WHERE rowid=$bid"; $result = $db->query($sql); } @@ -62,7 +62,7 @@ print "Factures"; print "\n"; $sql = "SELECT c.libelle as nom, sum(s.amount) as total"; -$sql .= " FROM c_chargesociales as c, llx_chargesociales as s"; +$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s"; $sql .= " WHERE s.fk_type = c.id AND s.paye = 1"; $sql .= " GROUP BY lower(c.libelle) ASC"; diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index cda90dd344f..3e965be97a6 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.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 @@ -53,7 +54,7 @@ print "Factures"; print "\n"; $sql = "SELECT c.libelle as nom, sum(s.amount) as total"; -$sql .= " FROM c_chargesociales as c, llx_chargesociales as s"; +$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s"; $sql .= " WHERE s.fk_type = c.id AND s.paye = 1"; $sql .= " GROUP BY lower(c.libelle) ASC"; @@ -76,8 +77,8 @@ if ( $db->query($sql) ) /* * Factures fournisseurs */ -$sql = "SELECT sum(f.amount) as total"; -$sql .= " FROM llx_facture_fourn as f"; +$sql = "SELECT sum(f.amount) as total"; +$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; if ( $db->query($sql) ) { $num = $db->num_rows(); diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 0c64f5b62c5..13fc8480eb6 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/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 @@ -89,13 +90,13 @@ if ($action == 'attribute_prefix') if ($action == 'recontact') { $dr = mktime(0, 0, 0, $remonth, $reday, $reyear); - $sql = "INSERT INTO llx_soc_recontact (fk_soc, datere, author) VALUES ($socid, $dr,'". $GLOBALS["REMOTE_USER"]."')"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."soc_recontact (fk_soc, datere, author) VALUES ($socid, $dr,'". $GLOBALS["REMOTE_USER"]."')"; $result = $db->query($sql); } if ($action == 'note') { - $sql = "UPDATE llx_societe SET note='$note' WHERE idp=$socid"; + $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='$note' WHERE idp=$socid"; $result = $db->query($sql); } @@ -109,7 +110,7 @@ if ($action == 'stcomm') if ($result) { - $sql = "UPDATE llx_societe SET fk_stcomm=$stcommid WHERE idp=$socid"; + $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=$stcommid WHERE idp=$socid"; $result = $db->query($sql); } else @@ -120,7 +121,7 @@ if ($action == 'stcomm') if ($actioncommid) { - $sql = "INSERT INTO llx_actioncomm (datea, fk_action, fk_soc, fk_user_author) VALUES ('$dateaction',$actioncommid,$socid,'" . $user->id . "')"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm (datea, fk_action, fk_soc, fk_user_author) VALUES ('$dateaction',$actioncommid,$socid,'" . $user->id . "')"; $result = @$db->query($sql); if (!$result) @@ -137,7 +138,7 @@ if ($action == 'stcomm') */ 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)."%'"; } @@ -166,7 +167,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 "; -$sql .= " FROM llx_societe as s, c_stcomm as st WHERE s.fk_stcomm = st.id AND s.client=1"; +$sql .= " 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/compta/index.php b/htdocs/compta/index.php index 2b170c96a31..8af802d355d 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.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 @@ -39,12 +40,12 @@ llxHeader("","Accueil Compta"); if ($action == 'add_bookmark') { - $sql = "DELETE FROM llx_bookmark WHERE fk_soc = ".$socidp." AND fk_user=".$user->id; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark WHERE fk_soc = ".$socidp." AND fk_user=".$user->id; if (! $db->query($sql) ) { print $db->error(); } - $sql = "INSERT INTO llx_bookmark (fk_soc, dateb, fk_user) VALUES ($socidp, now(),".$user->id.");"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_soc, dateb, fk_user) VALUES ($socidp, now(),".$user->id.");"; if (! $db->query($sql) ) { print $db->error(); @@ -53,7 +54,7 @@ if ($action == 'add_bookmark') if ($action == 'del_bookmark') { - $sql = "DELETE FROM llx_bookmark WHERE rowid=$bid"; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."bookmark WHERE rowid=$bid"; $result = $db->query($sql); } /* @@ -94,7 +95,7 @@ print '
'; * Factures brouillons */ -$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp FROM llx_facture as f, llx_societe as s WHERE s.idp = f.fk_soc AND f.fk_statut = 0"; +$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s WHERE s.idp = f.fk_soc AND f.fk_statut = 0"; if ( $db->query($sql) ) { @@ -132,7 +133,7 @@ if ($user->societe_id == 0) { $sql = "SELECT c.amount, cc.libelle"; - $sql .= " FROM llx_chargesociales as c, c_chargesociales as cc"; + $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as c, ".MAIN_DB_PREFIX."c_chargesociales as cc"; $sql .= " WHERE c.fk_type = cc.id AND c.paye=0"; if ( $db->query($sql) ) @@ -170,7 +171,7 @@ if ($user->societe_id == 0) * */ $sql = "SELECT s.idp, s.nom,b.rowid as bid"; -$sql .= " FROM llx_societe as s, llx_bookmark as b"; +$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."bookmark as b"; $sql .= " WHERE b.fk_soc = s.idp AND b.fk_user = ".$user->id; $sql .= " ORDER BY lower(s.nom) ASC"; diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 7dcf61f0cd0..90898a560f7 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.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 @@ -41,7 +42,7 @@ print "Montant"; print "\n"; $sql = "SELECT s.nom,s.idp,sum(f.amount) as amount"; -$sql .= " FROM llx_societe as s,llx_facture as f WHERE f.fk_soc = s.idp AND f.fk_statut = 1 AND f.fk_user_valid is not NULL"; +$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.idp AND f.fk_statut = 1 AND f.fk_user_valid is not NULL"; $sql .= " GROUP BY s.nom ASC"; @@ -80,7 +81,7 @@ print ''.price($total).''; * */ $sql = "SELECT s.nom,s.idp,sum(f.total_ht) as amount"; -$sql .= " FROM llx_societe as s,llx_facture_fourn as f WHERE f.fk_soc = s.idp"; +$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f WHERE f.fk_soc = s.idp"; $sql .= " GROUP BY s.nom ASC, s.idp"; @@ -122,7 +123,7 @@ $subtotal = 0; print 'Prestations déductibles'; $sql = "SELECT c.libelle as nom, sum(s.amount) as amount"; -$sql .= " FROM c_chargesociales as c, llx_chargesociales as s"; +$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s"; $sql .= " WHERE s.fk_type = c.id AND c.deductible=1"; $sql .= " GROUP BY c.libelle DESC"; @@ -158,7 +159,7 @@ $subtotal = 0; print 'Prestations NON déductibles'; $sql = "SELECT c.libelle as nom, sum(s.amount) as amount"; -$sql .= " FROM c_chargesociales as c, llx_chargesociales as s"; +$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s"; $sql .= " WHERE s.fk_type = c.id AND c.deductible=0"; $sql .= " GROUP BY c.libelle DESC"; diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 7449a17d109..d58d283f712 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.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 @@ -42,7 +43,7 @@ function valeur($sql) if ($action == 'add') { - $sql = "INSERT INTO llx_chargesociales (fk_type, libelle, date_ech,amount) "; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, libelle, date_ech,amount) "; $sql .= " VALUES ($type,'$libelle','$date',$amount);"; if (! $db->query($sql) ) @@ -67,7 +68,7 @@ print "\n"; $sql = "SELECT c.libelle as nom, s.amount,".$db->pdate("s.date_ech")." as de, s.date_pai, s.libelle, s.paye,".$db->pdate("s.periode")." as periode,".$db->pdate("s.date_pai")." as dp"; -$sql .= " FROM c_chargesociales as c, llx_chargesociales as s"; +$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s"; $sql .= " WHERE s.fk_type = c.id"; if ($year > 0) {