diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 3cfb31b73a7..c32dde55f3f 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -1,5 +1,6 @@ + * Copyright (C) 2005 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 @@ -17,15 +18,25 @@ * * $Id$ * $Source$ - * */ + +/** + \file htdocs/compta/prelevement/bons.php + \brief Page liste des bons de prelevements + \version $Revision$ +*/ + require("./pre.inc.php"); +$langs->load("withdrawals"); + $page = $_GET["page"]; $sortorder = $_GET["sortorder"]; $sortfield = $_GET["sortfield"]; + llxHeader('','Prélèvements - Bons'); + /* * Sécurité accés client */ @@ -35,26 +46,18 @@ if ($user->societe_id > 0) $socidp = $user->societe_id; } -if ($sortorder == "") $sortorder="DESC"; -if ($sortfield == "") $sortfield="p.datec"; - -/* - * Recherche - * - * - */ if ($page == -1) { $page = 0 ; } - $offset = $conf->liste_limit * $page ; $pageprev = $page - 1; $pagenext = $page + 1; +if (! $sortorder) $sortorder="DESC"; +if (! $sortfield) $sortfield="p.datec"; + /* * Mode Liste * - * - * */ $sql = "SELECT p.rowid, p.ref, p.amount,".$db->pdate("p.datec")." as datec"; $sql .= ", p.statut"; @@ -70,22 +73,23 @@ if ($result) $urladd= "&statut=".$_GET["statut"]; - print_barre_liste("Bons de prélèvements", $page, "bons.php", $urladd, $sortfield, $sortorder, '', $num); + print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, "bons.php", $urladd, $sortfield, $sortorder, '', $num); + print"\n\n"; - print ''; + print '
'; print ''; print_liste_field_titre("Bon","bons.php","p.ref"); - print_liste_field_titre("Date","bons.php","p.datec","","",'align="center"'); + print_liste_field_titre($langs->trans("Date"),"bons.php","p.datec","","",'align="center"'); - print ''; + print ''; print ''; print ''; - print ''; - print ''; + print ''; print ''; + print ''; print ''; print ''; @@ -113,10 +117,11 @@ if ($result) } else { - print $db->error() . ' ' . $sql; + dolibarr_print_error($db); } $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); + ?> diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 76ee0d3fcbd..3236f26963b 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -1,5 +1,6 @@ + * Copyright (C) 2005 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 @@ -19,16 +20,17 @@ * $Source$ */ -/*! - \file htdocs/compta/prelevement/index.php - \brief Prelevement - \version $Revision$ +/** + \file htdocs/compta/prelevement/demandes.php + \brief Page de la liste des demandes de prélèvements + \version $Revision$ */ require("./pre.inc.php"); - require_once DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php"; +$langs->load("widthdrawals"); + if ($user->societe_id > 0) { $socidp = $user->societe_id; @@ -45,13 +47,12 @@ $sortorder = $_GET["sortorder"]; $sortfield = $_GET["sortfield"]; if ($page == -1) $page = 0 ; - $offset = $conf->liste_limit * $page ; $pageprev = $page - 1; $pagenext = $page + 1; +if (! $sortorder) $sortorder="DESC"; +if (! $sortfield) $sortfield="f.facnumber"; -if ($sortorder == "") $sortorder="DESC"; -if ($sortfield == "") $sortfield="f.facnumber"; /* * Demandes en attente @@ -91,10 +92,14 @@ if ( $db->query($sql) ) print ''; print ''; - print ''; - print ''; + + print ''; + print ''; + + print ''; + print ''; $var = True; @@ -128,5 +133,6 @@ else dolibarr_print_error($db); } -llxFooter(); + +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 7d536cec776..f013c84a351 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -21,23 +21,25 @@ */ /** - \file htdocs/compta/prelevement/index.php - \brief Prelevement - \version $Revision$ + \file htdocs/compta/prelevement/index.php + \brief Prelevement + \version $Revision$ */ require("./pre.inc.php"); - require_once DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php"; +$langs->load("withdrawals"); + if ($user->societe_id > 0) { $socidp = $user->societe_id; } + llxHeader(); -print_titre($langs->trans("StandingOrders")); +print_titre($langs->trans("StandingOrdersArea")); print '
'; @@ -62,7 +64,7 @@ if ($result) print"\n\n"; print '
Montant'.$langs->trans("Amount").'
 
Emetteur
-'; - print ' '; - print ' 
-'; + print ''; + print '
'; - print ''; + print ''; print ''; print ''; @@ -143,4 +145,5 @@ else print '
BonDate
'.$langs->trans("Receipt").''.$langs->trans("Date").''.$langs->trans("Amount").'
'; llxFooter(); + ?> diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang new file mode 100755 index 00000000000..9c170e23334 --- /dev/null +++ b/htdocs/langs/en_US/withdrawals.lang @@ -0,0 +1,7 @@ +# Dolibarr language file - fr_FR - withdrawals +StandingOrdersArea=Standingd orders area +StandingOrders=Standing orders +StandingOrder=Standing orders +Withdrawals=Withdrawals +Withdrawal=Withdrawal +WithdrawalsReceipts=Withdrawals receipts \ No newline at end of file diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang new file mode 100755 index 00000000000..fb4670041f3 --- /dev/null +++ b/htdocs/langs/fr_FR/withdrawals.lang @@ -0,0 +1,7 @@ +# Dolibarr language file - fr_FR - withdrawals +StandingOrdersArea=Espace prélèvements +StandingOrders=Prélèvements +StandingOrder=Prélèvement +Withdrawals=Retraits +Withdrawal=Retrait +WithdrawalsReceipts=Bons de prélèvements \ No newline at end of file