diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php index 9145caead75..c8a081820be 100644 --- a/htdocs/comm/prospect/prospects.php +++ b/htdocs/comm/prospect/prospects.php @@ -78,19 +78,9 @@ if ($_GET["action"] == 'cstc') $sql = "SELECT s.rowid, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, st.libelle as stcomm, s.prefix_comm, s.fk_stcomm "; $sql .= ", d.nom as departement"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user"; -$sql .= " FROM (".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."societe as s"; - -// Avec MySQL 5.0 la procédure de requêtes jointes (JOIN) a changé pour suivre les standards plus correctement. -// référence: http://dev.mysql.com/doc/refman/5.0/fr/join.html -if (!$user->rights->commercial->client->voir && !$socid) -{ - $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc)"; -} -else -{ - $sql .=")"; -} - +$sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st"; +if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; +$sql.= ", ".MAIN_DB_PREFIX."societe as s"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d on (d.rowid = s.fk_departement)"; $sql .= " WHERE s.fk_stcomm = st.id AND s.client = 2"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; diff --git a/htdocs/compta/ventilation/lignes.php b/htdocs/compta/ventilation/lignes.php index ff4e962f97c..cb176a6f6c5 100644 --- a/htdocs/compta/ventilation/lignes.php +++ b/htdocs/compta/ventilation/lignes.php @@ -57,10 +57,10 @@ $offset = $limit * $page ; $sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_taux, l.fk_code_ventilation, c.intitule, c.numero,"; $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type"; -$sql.= " FROM (".MAIN_DB_PREFIX."facturedet as l"; -$sql.= " , ".MAIN_DB_PREFIX."facture as f"; -$sql.= " , ".MAIN_DB_PREFIX."compta_compte_generaux as c)"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON (p.rowid = l.fk_product)"; +$sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; +$sql.= " , ".MAIN_DB_PREFIX."compta_compte_generaux as c"; +$sql.= " , ".MAIN_DB_PREFIX."facturedet as l"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product"; $sql.= " WHERE f.rowid = l.fk_facture AND f.fk_statut = 1 AND l.fk_code_ventilation <> 0 "; $sql.= " AND c.rowid = l.fk_code_ventilation"; if (strlen(trim($_GET["search_facture"]))) diff --git a/htdocs/compta/ventilation/liste.php b/htdocs/compta/ventilation/liste.php index caded546e21..3525332bcfd 100644 --- a/htdocs/compta/ventilation/liste.php +++ b/htdocs/compta/ventilation/liste.php @@ -59,9 +59,9 @@ $offset = $limit * $page ; $sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.price, l.rowid, l.fk_code_ventilation,"; $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type"; -$sql.= " FROM (".MAIN_DB_PREFIX."facturedet as l"; -$sql.= " , ".MAIN_DB_PREFIX."facture as f)"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON (p.rowid = l.fk_product)"; +$sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; +$sql.= " , ".MAIN_DB_PREFIX."facturedet as l"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product"; $sql.= " WHERE f.rowid = l.fk_facture AND f.fk_statut = 1 AND fk_code_ventilation = 0"; $sql.= " ORDER BY l.rowid DESC ".$db->plimit($limit+1,$offset); diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php index c0b8e447c86..4873b39fd60 100644 --- a/htdocs/expedition/commande.php +++ b/htdocs/expedition/commande.php @@ -494,9 +494,9 @@ if ($_GET["id"] > 0) $sql .= " , ed.qty as qty_livre, e.ref, ed.fk_expedition as expedition_id"; $sql .= ",".$db->pdate("e.date_expedition")." as date_expedition"; if ($conf->livraison->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref"; - $sql .= " FROM (".MAIN_DB_PREFIX."commandedet as cd"; - $sql .= " , ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."expedition as e)"; - if ($conf->livraison->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON (l.fk_expedition = e.rowid)"; + $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd"; + $sql .= " , ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."expedition as e"; + if ($conf->livraison->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid"; $sql .= " WHERE cd.fk_commande = ".$commande->id; $sql .= " AND cd.rowid = ed.fk_commande_ligne"; $sql .= " AND ed.fk_expedition = e.rowid";