diff --git a/htdocs/compta/prelevement/bon-prelevement.class.php b/htdocs/compta/prelevement/bon-prelevement.class.php index 74624b790ed..0c02ab4735a 100644 --- a/htdocs/compta/prelevement/bon-prelevement.class.php +++ b/htdocs/compta/prelevement/bon-prelevement.class.php @@ -15,16 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** \file htdocs/bon-prelevement.class.php \ingroup prelevement - \brief Fichier de la classe des bons de pr�l�vements - \version $Revision$ + \brief Fichier de la classe des bons de prelevements + \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php"); @@ -217,7 +214,7 @@ class BonPrelevement extends CommonObject function fetch($rowid) { global $conf; - + $sql = "SELECT p.rowid, p.ref, p.amount, p.note, p.credite"; $sql.= ", ".$this->db->pdate("p.datec")." as dc"; $sql.= ", ".$this->db->pdate("p.date_trans")." as date_trans"; @@ -359,7 +356,7 @@ class BonPrelevement extends CommonObject function set_infocredit($user, $date) { global $conf; - + $error == 0; if ($this->_fetched == 1) @@ -432,7 +429,7 @@ class BonPrelevement extends CommonObject function set_infotrans($user, $date, $method) { global $conf; - + $error == 0; dol_syslog("bon-prelevement::set_infotrans Start",LOG_INFO); if ($this->db->begin()) @@ -499,7 +496,7 @@ class BonPrelevement extends CommonObject function Notify($user, $action, $subject, $message, $joinfile=0) { global $conf; - + $message .= "\n\n--\n"; $message .= "Ceci est un message automatique envoye par Dolibarr"; @@ -553,7 +550,7 @@ class BonPrelevement extends CommonObject function _get_list_factures() { global $conf; - + $arr = array(); /* @@ -601,7 +598,7 @@ class BonPrelevement extends CommonObject function SommeAPrelever() { global $conf; - + $sql = "SELECT sum(f.total_ttc)"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd"; @@ -640,7 +637,7 @@ class BonPrelevement extends CommonObject function NbFactureAPrelever($banque=0,$agence=0) { global $conf; - + $sql = "SELECT count(f.rowid)"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd"; diff --git a/htdocs/compta/prelevement/config.php b/htdocs/compta/prelevement/config.php index 819fa46e8ca..cde8b15431b 100644 --- a/htdocs/compta/prelevement/config.php +++ b/htdocs/compta/prelevement/config.php @@ -19,10 +19,10 @@ */ /** - \file htdocs/compta/prelevement/config.php - \ingroup prelevement - \brief Page configuration des prelevements - \version $Id$ + * \file htdocs/compta/prelevement/config.php + * \ingroup prelevement + * \brief Page configuration des prelevements + * \version $Id$ */ require("./pre.inc.php"); @@ -70,13 +70,12 @@ llxHeader('',$langs->trans("WithdrawalsSetup")); print_fiche_titre($langs->trans("WithdrawalsSetup")); -print "
"; if ($user->rights->prelevement->bons->configurer) print '
'; print ''; -print ''; +print '
'; print ''; print ''; if ($user->rights->prelevement->bons->configurer) @@ -136,10 +135,10 @@ if ($user->rights->prelevement->bons->configurer) print '
'.$langs->trans("Parameter").''; print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; if ($user->rights->prelevement->bons->configurer) - print ''; + print ''; print "\n"; if ($user->rights->prelevement->bons->configurer) @@ -229,7 +228,7 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION) print ''; - print ''; - print ''; + print ''; } @@ -246,14 +245,14 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION) $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_notifications as pn"; $sql.= " WHERE u.rowid = pn.fk_user"; - $sql.= " AND u.entity IN (0,".$conf->entity.")"; + $sql.= " AND u.entity IN (0,".$conf->entity.")"; $resql = $db->query($sql); if ($resql) { $num = $db->num_rows($resql); $i = 0; - $var = True; + $var = false; while ($i < $num) { $obj = $db->fetch_object($resql); @@ -266,7 +265,7 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION) if ($user->rights->prelevement->bons->configurer) { - print ''; + print ''; } else { diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index e5551f9211c..b0c95ea11bc 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005 Laurent Destailleur + * Copyright (C) 2005-2009 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -19,9 +19,9 @@ */ /** - \file htdocs/compta/prelevement/stats.php - \brief Page de stats des prélèvements - \version $Id$ + * \file htdocs/compta/prelevement/stats.php + * \brief Page de stats des prelevements + * \version $Id$ */ require("./pre.inc.php"); @@ -35,14 +35,12 @@ if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'prelevement','','','bons'); -llxHeader('',$langs->trans("WithdrawStatistics")); - /* - * - * Stats générales - * + * View */ +llxHeader('',$langs->trans("WithdrawStatistics")); + print_titre($langs->trans("WithdrawStatistics")); @@ -56,10 +54,10 @@ if ($db->query($sql)) { $num = $db->num_rows(); $i = 0; - + if ( $num >0 ) { - $row = $db->fetch_row(); + $row = $db->fetch_row(); $total = $row[0]; $nbtotal = $row[1]; } @@ -80,56 +78,56 @@ if ($db->query($sql)) { $num = $db->num_rows(); $i = 0; - + print"\n\n"; print '
NomValeur'.$langs->trans("User").''.$langs->trans("Value").'Action'.$langs->trans("Action").'
'; + print ''; print '
rowid.'">'.img_delete().'
rowid.'">'.img_delete().'
'; print ''; print ''; print ''; - + $var=True; - $st[0] = "En attente"; - $st[1] = "En attente"; - $st[2] = "Crédité"; - $st[3] = "Rejeté"; - + $st[0] = "Wainting"; + $st[1] = "Wainting"; + $st[2] = "Credited"; + $st[3] = "Rejected"; + while ($i < $num) { - $row = $db->fetch_row(); - + $row = $db->fetch_row(); + print "'; - + $var=!$var; $i++; } print ''; - print ''; print "
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
"; - print $st[$row[2]]; + print $st[$row[2]]; print ''; - print $row[1]; + print $row[1]; - print ''; + print ''; print round($row[1]/$nbtotal*100,2)." %"; print ''; - print price($row[0]); - - print ''; - print round($row[0]/$total*100,2)." %"; + print price($row[0]); + + print ''; + print round($row[0]/$total*100,2)." %"; print '
'.$langs->trans("Total").''.$nbtotal.' '; - print price($total); + print ''.$nbtotal.' '; + print price($total); print ' 
"; $db->free(); } -else +else { dol_print_error($db); -} +} /* @@ -151,10 +149,10 @@ if ($db->query($sql)) { $num = $db->num_rows(); $i = 0; - + if ( $num > 0 ) { - $row = $db->fetch_row(); + $row = $db->fetch_row(); $total = $row[0]; $nbtotal = $row[1]; } @@ -179,54 +177,54 @@ if ($db->query($sql)) { $num = $db->num_rows(); $i = 0; - + print"\n\n"; print ''; print ''; print ''; print ''; - + $var=True; require_once DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"; $Rejet = new RejetPrelevement($db, $user); - + while ($i < $num) { - $row = $db->fetch_row(); - + $row = $db->fetch_row(); + print "'; - + $var=!$var; $i++; } print ''; - print ''; print "
'.$langs->trans("Status").''.$langs->trans("Number").'%'.$langs->trans("Amount").'%
"; - print $Rejet->motifs[$row[2]]; + print $Rejet->motifs[$row[2]]; print ''.$row[1]; - print ''; + print ''; print round($row[1]/$nbtotal*100,2)." %"; - print ''; + print ''; print price($row[0]); - print ''; + print ''; print round($row[0]/$total*100,2)." %"; print '
'.$langs->trans("Total").''.$nbtotal.' '; - print price($total); + print ' '; + print price($total); print ' 
"; $db->free(); } -else +else { dol_print_error($db); -} +} $db->close();