diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 2b5b50ccd4e..ff5bc9cbe7f 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -1,7 +1,7 @@ - * Copyright (C) 2004 Laurent Destailleur - * Copyright (C) 2004 Eric Seigne +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004 Eric Seigne * * 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 @@ -22,7 +22,7 @@ * */ -/*! +/** \file htdocs/compta/deplacement/index.php \brief Page liste des déplacements */ @@ -43,14 +43,9 @@ $sortorder=$_GET["sortorder"]; $sortfield=$_GET["sortfield"]; $page=$_GET["page"]; -if ($sortorder == "") -{ - $sortorder="DESC"; -} -if ($sortfield == "") -{ - $sortfield="d.dated"; -} +if (! $sortorder) $sortorder="DESC"; +if (! $sortfield) $sortfield="d.dated"; + if ($page == -1) { $page = 0 ; } @@ -70,10 +65,11 @@ if ($user->societe_id > 0) $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit + 1 ,$offset); -if ( $db->query($sql) ) +$resql=$db->query($sql); +if ($resql) { - $num = $db->num_rows(); - print_barre_liste("Liste des déplacements", $page, "index.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); + $num = $db->num_rows($resql); + print_barre_liste($langs->trans("ListOfTrips"), $page, "index.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; print ''; @@ -110,5 +106,5 @@ else } $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ révision $Revision$'); ?> diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index 31749c874b0..b872d5a097d 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -1,4 +1,5 @@ # Dolibarr language file - en_US - trips Trip=Trip Trips=Trips -AddTrip=Add trip \ No newline at end of file +AddTrip=Add trip +ListOfTrips=List of trips \ No newline at end of file diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang index 56b2d9ae7a5..67db6c241bf 100644 --- a/htdocs/langs/fr_FR/trips.lang +++ b/htdocs/langs/fr_FR/trips.lang @@ -2,3 +2,4 @@ Trip=Déplacement Trips=Déplacements AddTrip=Ajouter déplacement +ListOfTrips=Liste des déplacements \ No newline at end of file