diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 08405a5e43a..d10a3df94ba 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1613,7 +1613,7 @@ else $soc->fetch($socidp); } - print_barre_liste("Factures client".($socidp?" $soc->nom":""),$page,"facture.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("BillsCustomers")." ".($socidp?" $soc->nom":""),$page,"facture.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; print ''; @@ -1674,7 +1674,7 @@ else } } - print '\n"; if ($objp->df > 0 ) diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 4f7b8a1599b..f2b95279bd2 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -65,6 +65,8 @@ llxHeader('','Factures impay $page = $_GET["page"]; $sortorder=$_GET["sortorder"]; $sortfield=$_GET["sortfield"]; +if (! $sortorder) $sortorder="DESC"; +if (! $sortfield) $sortfield="f.datef"; if ($page == -1) { @@ -76,11 +78,6 @@ if ($user->rights->facture->lire) $limit = $conf->liste_limit; $offset = $limit * $page ; - if ($sortorder == "") - $sortorder="DESC"; - - if ($sortfield == "") - $sortfield="f.datef"; $sql = "SELECT s.nom,s.idp,f.facnumber,f.increment,f.total,f.total_ttc,".$db->pdate("f.datef")." as df, f.paye as paye, f.rowid as facid, f.fk_statut, sum(pf.amount) as am"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -150,7 +147,7 @@ if ($user->rights->facture->lire) $soc->fetch($socidp); } - print_barre_liste("Factures client".($socidp?" $soc->nom":""),$page,"impayees.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans("BillsCustomersUnpayed")." ".($socidp?" $soc->nom":""),$page,"impayees.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; print '
'.img_file()." \n"; + print ''.img_object($langs->trans("Bill"),"bill")." "; print ''.$objp->facnumber.''.$objp->increment."
'; print ''; @@ -198,7 +195,7 @@ if ($user->rights->facture->lire) print ""; $class = "impayee"; - print '\n"; if ($objp->df > 0 ) diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index f48a1ab4dbb..4989d7fd049 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -41,7 +41,7 @@ if ($user->societe_id > 0) llxHeader(); -print_fiche_titre('Statistiques factures', $mesg); +print_fiche_titre($langs->trans("BillsStatistics"), $mesg); $stats = new FactureStats($db, $socidp); $year = strftime("%Y", time()); @@ -72,10 +72,10 @@ if ($db->query($sql)) { $num = $db->num_rows(); - print '
'.img_file()." \n"; + print ''.img_object($langs->trans("ShowBill"),"bill")." "; print ''.$objp->facnumber.''.$objp->increment."
'; - print ''; + print '
'.$langs->trans("Year").'Nb de factureSomme des factures
'; + print ''; print ''; diff --git a/htdocs/compta/facture/stats/month.php b/htdocs/compta/facture/stats/month.php index d6aef5334a2..77c0b743460 100644 --- a/htdocs/compta/facture/stats/month.php +++ b/htdocs/compta/facture/stats/month.php @@ -1,6 +1,6 @@ - * Copyright (c) 2004 Laurent Destailleur +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (c) 2004-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 @@ -30,6 +30,9 @@ require("./pre.inc.php"); +$GRAPHHEIGHT=240; +$GRAPHWIDTH=500; + /* * Sécurité accés client */ @@ -47,7 +50,7 @@ $mesg = ''.img_previous().' '; $mesg.= $langs->trans("Year")." $year"; $mesg.= ' '.img_next().''; -print_fiche_titre('Statistiques des factures '.$year, $mesg); +print_fiche_titre($langs->trans("BillsStatistics"), $mesg); $stats = new FactureStats($db, $socidp); $data = $stats->getNbByMonth($year); @@ -61,8 +64,8 @@ $px = new BarGraph($data); $mesg = $px->isGraphKo(); if (! $mesg) { $px->SetMaxValue($px->GetMaxValue()); - $px->SetWidth(500); - $px->SetHeight(280); + $px->SetWidth($GRAPHWIDTH); + $px->SetHeight($GRAPHHEIGHT); $px->draw($filename, $data, $year); } @@ -83,8 +86,8 @@ $mesg = $px->isGraphKo(); if (! $mesg) { $px->SetYLabel($langs->trans("AmountTotal")); $px->SetMaxValue($px->GetAmountMaxValue()); - $px->SetWidth(500); - $px->SetHeight(250); + $px->SetWidth($GRAPHWIDTH); + $px->SetHeight($GRAPHHEIGHT); $px->draw($filename_amount, $data, $year); } $res = $stats->getAverageByMonth($year); @@ -104,13 +107,13 @@ $mesg = $px->isGraphKo(); if (! $mesg) { $px->SetYLabel($langs->trans("AmountAverage")); $px->SetMaxValue($px->GetAmountMaxValue()); - $px->SetWidth(500); - $px->SetHeight(250); + $px->SetWidth($GRAPHWIDTH); + $px->SetHeight($GRAPHHEIGHT); $px->draw($filename_avg, $data, $year); } -print '
'.$langs->trans("Year").''.$langs->trans("NumberOfBills").''.$langs->trans("AmountTotal").''; - print 'Nombre de factures par mois
'; + print $langs->trans("NumberOfBillsByMonth").'
'; if ($mesg) { print $mesg; } else { print 'Nombre de factures par mois'; } print '
'; -print ''; +print '
Nombre par mois
'; +print ''; print '
'.$langs->trans("NumberOfBillsByMonth").''; if ($mesg) { print $mesg; } else { print ''; } diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index c6aad8ab5ef..d07eccc22e5 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-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 @@ -20,7 +20,16 @@ * $Source$ * */ + +/** + \file htdocs/compta/paiement/liste.php + \ingroup compta + \brief Page liste des paiements des factures clients + \version $Revision$ +*/ + require("./pre.inc.php"); + /* * Sécurité accés client */ @@ -37,6 +46,8 @@ if ($user->societe_id > 0) llxHeader(); $page=$_GET["page"]; +$sortorder=$_GET["sortorder"]; +$sortfield=$_GET["sortfield"]; if ($page == -1) $page = 0 ; @@ -44,11 +55,8 @@ if ($page == -1) $limit = $conf->liste_limit; $offset = $limit * $page ; -if ($sortorder == "") - $sortorder="DESC"; - -if ($sortfield == "") - $sortfield="p.rowid"; +if (! $sortorder) $sortorder="DESC"; +if (! $sortfield) $sortfield="p.rowid"; $sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, p.amount, p.statut"; $sql .=", c.libelle as paiement_type, p.num_paiement"; @@ -69,9 +77,10 @@ if ($result) print ''; print ''; - print ''; - print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","",""); - print ''; + print_liste_field_titre($langs->trans("Ref"),"liste.php","p.rowid","","","",$sortfield); + print_liste_field_titre($langs->trans("Date"),"liste.php","dp","","","",$sortfield); + print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","","","",$sortfield); + print ''; print ""; print "\n"; @@ -80,9 +89,8 @@ if ($result) $objp = $db->fetch_object($result); $var=!$var; print ""; - print '\n"; + print ''; + print '\n"; print "\n"; print ''; print '
'.$langs->trans("Date").''.$langs->trans("Amount").''.$langs->trans("AmountTTC").' 
'; - print img_file(); - print " ".strftime("%d %B %Y",$objp->dp)."'.img_file().' '.$objp->rowid.''.dolibarr_print_date($objp->dp)."$objp->paiement_type $objp->num_paiement'.price($objp->amount).'';