From e69a264b3aad59b32f2185d0c18540839e785ebb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 11 Jun 2004 00:13:15 +0000 Subject: [PATCH] =?UTF-8?q?New:=20Le=20pays=20s'affiche=20sur=20les=20lign?= =?UTF-8?q?es=20des=20dictionnaires=20de=20donn=E9es=20multi-pays?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/admin/dict.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index b08a34dfba8..b2ffc356700 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -39,14 +39,14 @@ $tabnom[2] = "D $tabnom[3] = "Régions"; $tabnom[4] = "Pays"; -$tabsql[1] = "SELECT code, libelle, active FROM llx_c_forme_juridique ORDER BY active DESC, code ASC"; -$tabsql[2] = "SELECT rowid, code_departement as code , nom as libelle, active FROM llx_c_departements ORDER BY active DESC, code ASC"; -$tabsql[3] = "SELECT r.rowid as rowid, code_region as code , nom as libelle, p.libelle as pays, r.active FROM llx_c_regions as r, llx_c_pays as p WHERE r.fk_pays=p.rowid ORDER BY active DESC, code ASC"; +$tabsql[1] = "SELECT f.code, f.libelle, p.libelle as pays, f.active FROM llx_c_forme_juridique as f, llx_c_pays as p WHERE f.fk_pays=p.rowid ORDER BY p.rowid, f.active DESC, code ASC"; +$tabsql[2] = "SELECT d.rowid as rowid, d.code_departement as code , d.nom as libelle, p.libelle as pays, d.active FROM llx_c_departements as d, llx_c_regions as r, llx_c_pays as p WHERE d.fk_region=r.code_region and r.fk_pays=p.rowid ORDER BY p.rowid, d.active DESC, code ASC"; +$tabsql[3] = "SELECT r.rowid as rowid, code_region as code , nom as libelle, p.libelle as pays, r.active FROM llx_c_regions as r, llx_c_pays as p WHERE r.fk_pays=p.rowid ORDER BY p.rowid, r.active DESC, code ASC"; $tabsql[4] = "SELECT rowid, code, libelle, active FROM llx_c_pays ORDER BY active DESC, code ASC"; // Champs à afficher -$tabfield[1] = "code,libelle"; -$tabfield[2] = "code,libelle"; +$tabfield[1] = "code,libelle,pays"; +$tabfield[2] = "code,libelle,pays"; $tabfield[3] = "code,libelle,pays"; $tabfield[4] = "code,libelle";