diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index e98bff8d25e..f75a202e160 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -22,6 +22,7 @@ /** \file htdocs/compta/prelevement/bons.php + \ingroup prelevement \brief Page liste des bons de prelevements \version $Revision$ */ @@ -77,20 +78,19 @@ if ($result) print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, "bons.php", $urladd, $sortfield, $sortorder, '', $num); print"\n\n"; - print ''; + print '
'; + + print ''; + print_liste_field_titre($langs->trans("Receipt"),"bons.php","p.ref",'','','class="liste_titre"'); + print_liste_field_titre($langs->trans("Date"),"bons.php","p.datec","","",'class="liste_titre" align="center"'); + print ''; + print ''; + print ''; - - print_liste_field_titre("Bon","bons.php","p.ref"); - print_liste_field_titre($langs->trans("Date"),"bons.php","p.datec","","",'align="center"'); - - print ''; - - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index d33e1598e29..d5c00dbee77 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -87,22 +87,22 @@ if ( $db->query($sql) ) $num = $db->num_rows(); $i = 0; - print_barre_liste("Demandes de prélèvement à traiter", $page, "demandes.php", $urladd, $sortfield, $sortorder, '', $num); + print_barre_liste("Demandes de prélèvements à traiter", $page, "demandes.php", $urladd, $sortfield, $sortorder, '', $num); - print '
'.$langs->trans("Amount").'
'.$langs->trans("Amount").'
  
'; + print '
'; print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print ''; - - print ''; - print ''; + print ''; - - print ''; - + print ''; + print ''; print ''; $var = True; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 224f36406a1..45e1eea64d9 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.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,6 +20,14 @@ * $Source$ * */ + +/** + \file htdocs/compta/prelevement/factures.php + \ingroup prelevement + \brief Page liste des factures prélevées + \version $Revision$ +*/ + require("./pre.inc.php"); require_once DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"; @@ -63,13 +72,10 @@ if ($_GET["id"]) if ($bon->fetch($_GET["id"]) == 0) { - dolibarr_fiche_head($head, $hselected, 'Prélèvement : '. $bon->ref); print '
'.$langs->trans("Bill").''.$langs->trans("Company").'Date demandeEmetteur
'.$langs->trans("Bill").''.$langs->trans("Company").''.$langs->trans("Date").''.$langs->trans("Author").'
-'; + print '
-'; print ''; print '
'; - - print ''; - + print ''; print '
Référence'.$bon->ref.'
'.$langs->trans("Ref").''.$bon->ref.'

'; } else @@ -86,8 +92,6 @@ $offset = $conf->liste_limit * $page ; /* * Liste des factures - * - * */ $sql = "SELECT pf.rowid"; $sql .= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc"; @@ -122,14 +126,15 @@ if ($result) $urladd = "&id=".$_GET["id"]; - print_barre_liste("Factures", $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num); + print_barre_liste($langs->trans("Bills"), $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num); + print"\n\n"; - print ''; + print '
'; print ''; - print_liste_field_titre("Facture","factures.php","p.ref",'',$urladd); - print_liste_field_titre("Société","factures.php","s.nom",'',$urladd); - print_liste_field_titre("Montant","factures.php","f.total_ttc","",$urladd,'align="center"'); - print ''; + print_liste_field_titre("Facture","factures.php","p.ref",'',$urladd,'class="liste_titre"'); + print_liste_field_titre("Société","factures.php","s.nom",'',$urladd,'class="liste_titre"'); + print_liste_field_titre("Montant","factures.php","f.total_ttc","",$urladd,'class="liste_titre" align="center"'); + print ''; $var=True; diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index 7350c8b987a..0ce957b210c 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.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,8 +18,15 @@ * * $Id$ * $Source$ - * */ + +/** + \file htdocs/compta/prelevement/liste.php + \ingroup prelevement + \brief Page liste des prelevements + \version $Revision$ +*/ + require("./pre.inc.php"); if (!$user->rights->prelevement->bons->lire) @@ -88,31 +96,32 @@ if ($result) $urladd .= "&search_bon=".$_GET["search_bon"]; print_barre_liste("Lignes de prélèvements", $page, "liste.php", $urladd, $sortfield, $sortorder, '', $num); + print"\n\n"; - print '
 
 
'; - print ''; + print '
Ligne
'; - print_liste_field_titre("Bon","liste.php","p.ref"); - - print_liste_field_titre("Société","liste.php","s.nom"); - print_liste_field_titre("Date","liste.php","p.datec","","",'align="center"'); - - print ''; - print_liste_field_titre("Code client","liste.php","s.code_client",'','','align="center"'); - - print ''; - print ''; - print ''; - - print ''; - print ''; - print ''; - print ''; - print ''; - - print ''; + print ''; + print ''; + print_liste_field_titre($langs->trans("Receipt"),"liste.php","p.ref"); + print_liste_field_titre($langs->trans("Company"),"liste.php","s.nom"); + print_liste_field_titre($langs->trans("Date"),"liste.php","p.datec","","",'align="center"'); + print_liste_field_titre($langs->trans("Amount"),"liste.php","pl.amount"); + print_liste_field_titre($langs->trans("CustomerCode"),"liste.php","s.code_client",'','','align="center"'); + print ''; print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + $var=True; while ($i < min($num,$conf->liste_limit)) @@ -132,10 +141,11 @@ if ($result) print ''.$obj->ref."\n"; print '\n"; - print '\n"; - + print '\n"; print '\n"; print '\n"; + print ''; + print "\n"; $i++; } @@ -150,5 +160,5 @@ else $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/prelevement/liste_factures.php b/htdocs/compta/prelevement/liste_factures.php index d49b961b2c5..df45a94e68b 100644 --- a/htdocs/compta/prelevement/liste_factures.php +++ b/htdocs/compta/prelevement/liste_factures.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,13 +18,20 @@ * * $Id$ * $Source$ - * */ + +/** + \file htdocs/compta/prelevement/liste_factures.php + \ingroup prelevement + \brief Page liste des factures prélevées + \version $Revision$ +*/ + require("./pre.inc.php"); -require_once DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"; -require_once DOL_DOCUMENT_ROOT."/paiement.class.php"; -require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php"; +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php"); /* * Sécurité accés client @@ -83,25 +91,25 @@ if ($result) $urladd = "&socid=".$_GET["socid"]; print_barre_liste("Factures prélevées", $page, "liste_factures.php", $urladd, $sortfield, $sortorder, '', $num); + print"\n\n"; - print '
Montant
 
'.$langs->trans("Line").' 
  
'.stripslashes($obj->nom)."'.strftime("%d/%m/%Y",$obj->datec)."'.dolibarr_print_date($obj->datec)."'.price($obj->amount).' '.$langs->trans("Currency".$conf->monnaie)."'.$obj->code_client." 
'; - print ''; - print_liste_field_titre("Facture","liste_factures.php","f.facnumber",'',$urladd); - print_liste_field_titre("Société","liste_factures.php","s.nom",'',$urladd); - print_liste_field_titre("Montant","liste_factures.php","f.total_ttc","",$urladd,'align="right"'); - print_liste_field_titre("Bon","liste_factures.php","p.rowid","",$urladd,'align="center"'); + print '
Ligne
'; + print ''; + print ''; + print_liste_field_titre($langs->trans("Bill"),"liste_factures.php","f.facnumber",'',$urladd); + print_liste_field_titre($langs->trans("Company"),"liste_factures.php","s.nom",'',$urladd); + print_liste_field_titre($langs->trans("Amount"),"liste_factures.php","f.total_ttc","",$urladd,'align="right"'); + print_liste_field_titre($langs->trans("Receipt"),"liste_factures.php","p.rowid","",$urladd,'align="center"'); print ''; print ''; - print ''; - print ''; + print ''; + print ''; print "\n"; print ''; @@ -115,7 +123,6 @@ if ($result) print "
'.$langs->trans("Line").'
 '; + print '
 '; print ''; - print ''; + print ''; print ''; - - print ''; - print ''; print '
"; - print ' '; print ''; @@ -155,5 +162,5 @@ else $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?>