lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Laurent Destailleur 2009-08-17 17:46:59 +00:00
parent 8cc8844ed1
commit 4c36ed55e4
3 changed files with 70 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/compta/prelevement/bon-prelevement.class.php
View File

@ -15,16 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*/ */
/** /**
\file htdocs/bon-prelevement.class.php \file htdocs/bon-prelevement.class.php
\ingroup prelevement \ingroup prelevement
\brief Fichier de la classe des bons de pr<EFBFBD>l<EFBFBD>vements \brief Fichier de la classe des bons de prelevements
\version $Revision$ \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php");
@ -217,7 +214,7 @@ class BonPrelevement extends CommonObject
function fetch($rowid) function fetch($rowid)
{ {
global $conf; global $conf;
$sql = "SELECT p.rowid, p.ref, p.amount, p.note, p.credite"; $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.datec")." as dc";
$sql.= ", ".$this->db->pdate("p.date_trans")." as date_trans"; $sql.= ", ".$this->db->pdate("p.date_trans")." as date_trans";
@ -359,7 +356,7 @@ class BonPrelevement extends CommonObject
function set_infocredit($user, $date) function set_infocredit($user, $date)
{ {
global $conf; global $conf;
$error == 0; $error == 0;
if ($this->_fetched == 1) if ($this->_fetched == 1)
@ -432,7 +429,7 @@ class BonPrelevement extends CommonObject
function set_infotrans($user, $date, $method) function set_infotrans($user, $date, $method)
{ {
global $conf; global $conf;
$error == 0; $error == 0;
dol_syslog("bon-prelevement::set_infotrans Start",LOG_INFO); dol_syslog("bon-prelevement::set_infotrans Start",LOG_INFO);
if ($this->db->begin()) if ($this->db->begin())
@ -499,7 +496,7 @@ class BonPrelevement extends CommonObject
function Notify($user, $action, $subject, $message, $joinfile=0) function Notify($user, $action, $subject, $message, $joinfile=0)
{ {
global $conf; global $conf;
$message .= "\n\n--\n"; $message .= "\n\n--\n";
$message .= "Ceci est un message automatique envoye par Dolibarr"; $message .= "Ceci est un message automatique envoye par Dolibarr";
@ -553,7 +550,7 @@ class BonPrelevement extends CommonObject
function _get_list_factures() function _get_list_factures()
{ {
global $conf; global $conf;
$arr = array(); $arr = array();
/* /*
@ -601,7 +598,7 @@ class BonPrelevement extends CommonObject
function SommeAPrelever() function SommeAPrelever()
{ {
global $conf; global $conf;
$sql = "SELECT sum(f.total_ttc)"; $sql = "SELECT sum(f.total_ttc)";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
@ -640,7 +637,7 @@ class BonPrelevement extends CommonObject
function NbFactureAPrelever($banque=0,$agence=0) function NbFactureAPrelever($banque=0,$agence=0)
{ {
global $conf; global $conf;
$sql = "SELECT count(f.rowid)"; $sql = "SELECT count(f.rowid)";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";

31
htdocs/compta/prelevement/config.php
View File

@ -19,10 +19,10 @@
*/ */
/** /**
\file htdocs/compta/prelevement/config.php * \file htdocs/compta/prelevement/config.php
\ingroup prelevement * \ingroup prelevement
\brief Page configuration des prelevements * \brief Page configuration des prelevements
\version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -70,13 +70,12 @@ llxHeader('',$langs->trans("WithdrawalsSetup"));
print_fiche_titre($langs->trans("WithdrawalsSetup")); print_fiche_titre($langs->trans("WithdrawalsSetup"));
print "<br>";
if ($user->rights->prelevement->bons->configurer) if ($user->rights->prelevement->bons->configurer)
print '<form method="post" action="config.php?action=set">'; print '<form method="post" action="config.php?action=set">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="noborder" width="100%">'; print '<table class="nobordernopadding" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td width="30%">'.$langs->trans("Parameter").'</td>'; print '<td width="30%">'.$langs->trans("Parameter").'</td>';
if ($user->rights->prelevement->bons->configurer) if ($user->rights->prelevement->bons->configurer)
@ -136,10 +135,10 @@ if ($user->rights->prelevement->bons->configurer)
print '<td align="left">'; print '<td align="left">';
print '<input type="hidden" name="nom6" value="PRELEVEMENT_USER">'; print '<input type="hidden" name="nom6" value="PRELEVEMENT_USER">';
print '<select name="value6">'; print '<select name="value6">';
$sql = "SELECT u.rowid, u.name, u.firstname"; $sql = "SELECT u.rowid, u.name, u.firstname";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE u.entity IN (0,".$conf->entity.")"; $sql.= " WHERE u.entity IN (0,".$conf->entity.")";
if ($db->query($sql)) if ($db->query($sql))
{ {
@ -198,10 +197,10 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td width="30%">Nom</td>'; print '<td>'.$langs->trans("User").'</td>';
print '<td width="40%">Valeur</td>'; print '<td>'.$langs->trans("Value").'</td>';
if ($user->rights->prelevement->bons->configurer) if ($user->rights->prelevement->bons->configurer)
print '<td width="30%">Action</td>'; print '<td align="right">'.$langs->trans("Action").'</td>';
print "</tr>\n"; print "</tr>\n";
if ($user->rights->prelevement->bons->configurer) if ($user->rights->prelevement->bons->configurer)
@ -229,7 +228,7 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION)
print '</select></td>'; print '</select></td>';
print '<td align="left">'; print '<td>';
print '<select name="action">'; print '<select name="action">';
print '<option value="tr">Transmission du bon</option>'; print '<option value="tr">Transmission du bon</option>';
@ -237,7 +236,7 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION)
print '<option value="cr">Credit du bon</option>'; print '<option value="cr">Credit du bon</option>';
print '</select></td>'; print '</select></td>';
print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>'; print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
} }
@ -246,14 +245,14 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION)
$sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= ", ".MAIN_DB_PREFIX."prelevement_notifications as pn"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_notifications as pn";
$sql.= " WHERE u.rowid = pn.fk_user"; $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); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
$var = True; $var = false;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
@ -266,7 +265,7 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION)
if ($user->rights->prelevement->bons->configurer) if ($user->rights->prelevement->bons->configurer)
{ {
print '<td><a href="'.$_SERVER["PHP_SELF"].'?action=deletenotif&amp;notif='.$obj->rowid.'">'.img_delete().'</a></td></tr>'; print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=deletenotif&amp;notif='.$obj->rowid.'">'.img_delete().'</a></td></tr>';
} }
else else
{ {

94
htdocs/compta/prelevement/stats.php
View File

@ -1,6 +1,6 @@
<?PHP <?PHP
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -19,9 +19,9 @@
*/ */
/** /**
\file htdocs/compta/prelevement/stats.php * \file htdocs/compta/prelevement/stats.php
\brief Page de stats des prélèvements * \brief Page de stats des prelevements
\version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -35,14 +35,12 @@ if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'prelevement','','','bons'); $result = restrictedArea($user, 'prelevement','','','bons');
llxHeader('',$langs->trans("WithdrawStatistics"));
/* /*
* * View
* Stats générales
*
*/ */
llxHeader('',$langs->trans("WithdrawStatistics"));
print_titre($langs->trans("WithdrawStatistics")); print_titre($langs->trans("WithdrawStatistics"));
@ -56,10 +54,10 @@ if ($db->query($sql))
{ {
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
if ( $num >0 ) if ( $num >0 )
{ {
$row = $db->fetch_row(); $row = $db->fetch_row();
$total = $row[0]; $total = $row[0];
$nbtotal = $row[1]; $nbtotal = $row[1];
} }
@ -80,56 +78,56 @@ if ($db->query($sql))
{ {
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
print"\n<!-- debut table -->\n"; print"\n<!-- debut table -->\n";
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td align="right">%</td>'; print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td align="right">%</td>';
print '<td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>'; print '<td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
$var=True; $var=True;
$st[0] = "En attente"; $st[0] = "Wainting";
$st[1] = "En attente"; $st[1] = "Wainting";
$st[2] = "Crédité"; $st[2] = "Credited";
$st[3] = "Rejeté"; $st[3] = "Rejected";
while ($i < $num) while ($i < $num)
{ {
$row = $db->fetch_row(); $row = $db->fetch_row();
print "<tr $bc[$var]><td>"; print "<tr $bc[$var]><td>";
print $st[$row[2]]; print $st[$row[2]];
print '</td><td align="center">'; print '</td><td align="center">';
print $row[1]; print $row[1];
print '</td><td align="right">'; print '</td><td align="right">';
print round($row[1]/$nbtotal*100,2)." %"; print round($row[1]/$nbtotal*100,2)." %";
print '</td><td align="right">'; print '</td><td align="right">';
print price($row[0]); print price($row[0]);
print '</td><td align="right">'; print '</td><td align="right">';
print round($row[0]/$total*100,2)." %"; print round($row[0]/$total*100,2)." %";
print '</td></tr>'; print '</td></tr>';
$var=!$var; $var=!$var;
$i++; $i++;
} }
print '<tr class="liste_total"><td align="right">'.$langs->trans("Total").'</td>'; print '<tr class="liste_total"><td align="right">'.$langs->trans("Total").'</td>';
print '<td align="center">'.$nbtotal.'</td><td>&nbsp;</td><td align="right">'; print '<td align="center">'.$nbtotal.'</td><td>&nbsp;</td><td align="right">';
print price($total); print price($total);
print '</td><td align="right">&nbsp;</td>'; print '</td><td align="right">&nbsp;</td>';
print "</tr></table>"; print "</tr></table>";
$db->free(); $db->free();
} }
else else
{ {
dol_print_error($db); dol_print_error($db);
} }
/* /*
@ -151,10 +149,10 @@ if ($db->query($sql))
{ {
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
if ( $num > 0 ) if ( $num > 0 )
{ {
$row = $db->fetch_row(); $row = $db->fetch_row();
$total = $row[0]; $total = $row[0];
$nbtotal = $row[1]; $nbtotal = $row[1];
} }
@ -179,54 +177,54 @@ if ($db->query($sql))
{ {
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
print"\n<!-- debut table -->\n"; print"\n<!-- debut table -->\n";
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td>'; print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td>';
print '<td align="right">%</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>'; print '<td align="right">%</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
$var=True; $var=True;
require_once DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php";
$Rejet = new RejetPrelevement($db, $user); $Rejet = new RejetPrelevement($db, $user);
while ($i < $num) while ($i < $num)
{ {
$row = $db->fetch_row(); $row = $db->fetch_row();
print "<tr $bc[$var]><td>"; print "<tr $bc[$var]><td>";
print $Rejet->motifs[$row[2]]; print $Rejet->motifs[$row[2]];
print '</td><td align="center">'.$row[1]; print '</td><td align="center">'.$row[1];
print '</td><td align="right">'; print '</td><td align="right">';
print round($row[1]/$nbtotal*100,2)." %"; print round($row[1]/$nbtotal*100,2)." %";
print '</td><td align="right">'; print '</td><td align="right">';
print price($row[0]); print price($row[0]);
print '</td><td align="right">'; print '</td><td align="right">';
print round($row[0]/$total*100,2)." %"; print round($row[0]/$total*100,2)." %";
print '</td></tr>'; print '</td></tr>';
$var=!$var; $var=!$var;
$i++; $i++;
} }
print '<tr class="liste_total"><td align="right">'.$langs->trans("Total").'</td><td align="center">'.$nbtotal.'</td>'; print '<tr class="liste_total"><td align="right">'.$langs->trans("Total").'</td><td align="center">'.$nbtotal.'</td>';
print '<td>&nbsp;</td><td align="right">'; print '<td>&nbsp;</td><td align="right">';
print price($total); print price($total);
print '</td><td align="right">&nbsp;</td>'; print '</td><td align="right">&nbsp;</td>';
print "</tr></table>"; print "</tr></table>";
$db->free(); $db->free();
} }
else else
{ {
dol_print_error($db); dol_print_error($db);
} }
$db->close(); $db->close();