From 8a0e6cf69122ae86ed59afbd836e570c962ac5b0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Oct 2005 16:51:06 +0000 Subject: [PATCH] Fix: Modif requete pour passer en Mysql 5 --- htdocs/facture.class.php | 2 +- htdocs/paiement.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index 3f71a8c296e..7513287c334 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -334,7 +334,7 @@ class Facture $sql .= ', f.note, f.paye, f.fk_statut, f.fk_user_author'; $sql .= ', f.fk_mode_reglement, f.ref_client, p.code as mode_reglement_code, p.libelle as mode_reglement_libelle'; $sql .= ', f.fk_cond_reglement, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_facture'; - $sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'cond_reglement as c'; + $sql .= ' FROM '.MAIN_DB_PREFIX.'cond_reglement as c, '.MAIN_DB_PREFIX.'facture as f'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id'; $sql .= ' WHERE f.rowid='.$rowid.' AND c.rowid = f.fk_cond_reglement'; if ($societe_id > 0) diff --git a/htdocs/paiement.class.php b/htdocs/paiement.class.php index 92d6b91c037..de932e14314 100644 --- a/htdocs/paiement.class.php +++ b/htdocs/paiement.class.php @@ -74,7 +74,7 @@ class Paiement $sql = 'SELECT p.rowid,'.$this->db->pdate('p.datep').' as dp, p.amount, p.statut, p.fk_bank'; $sql .=', c.libelle as paiement_type'; $sql .= ', p.num_paiement, p.note, b.fk_account'; - $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p, '.MAIN_DB_PREFIX.'c_paiement as c '; + $sql .= ' FROM '.MAIN_DB_PREFIX.'c_paiement as c, '.MAIN_DB_PREFIX.'paiement as p'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid '; $sql .= ' WHERE p.fk_paiement = c.id'; $sql .= ' AND p.rowid = '.$id;