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

7
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");

25
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)
@ -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>';
} }
@ -253,7 +252,7 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION)
{ {
$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
{ {

24
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"));
@ -89,10 +87,10 @@ if ($db->query($sql))
$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)
{ {