diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index f782da8e38ff6e32dd9b1136001581956d9c9def..78ce041b684ed9289efce9e29081c1e4390cbbf4 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
+ * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@@ -26,6 +27,7 @@
*/
require('../../main.inc.php');
+require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
$langs->load("widthdrawals");
$langs->load("categories");
@@ -42,6 +44,7 @@ $sortfield = $_GET["sortfield"];
llxHeader('',$langs->trans("WithdrawalsReceipts"));
+$bon=new BonPrelevement($db,"");
if ($page == -1) { $page = 0 ; }
$offset = $conf->liste_limit * $page ;
@@ -51,6 +54,7 @@ if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="p.datec";
+
/*
* Mode Liste
*
@@ -97,8 +101,10 @@ if ($result)
$var=!$var;
print "<tr $bc[$var]><td>";
- print '<img border="0" src="./img/statut'.$obj->statut.'.png"></a> ';
-
+
+ print $bon->LibStatut($obj->statut,2);
+ print " ";
+
print '<a href="fiche.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n";
diff --git a/htdocs/compta/prelevement/class/ligne-prelevement.class.php b/htdocs/compta/prelevement/class/ligne-prelevement.class.php
index dd0657be34e8928edd803eadda09a55def3331e4..5fdd8a37cc2008fd6a4532840a23bae10ccd06b7 100644
--- a/htdocs/compta/prelevement/class/ligne-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligne-prelevement.class.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
- * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@@ -140,20 +140,20 @@ class LignePrelevement
{
if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
- if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut7').' '.$langs->trans($this->statuts[$statut]);
+ if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
}
if ($mode == 2)
{
if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
- if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut7');
+ if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8');
}
if ($mode == 3)
{
if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
if ($statut==2) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
- if ($statut==3) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut7');
+ if ($statut==3) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut8');
}
}
}
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 96253098537bcfeacd824ccf1b3b4610112bed9e..f10c66363b438557ca8b25d763e4a6116db49516 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
- * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@@ -51,6 +51,40 @@ if ($_GET["id"])
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'dayhour').'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
+
+ $relativepath = 'receipts/'.$bon->ref;
+
+ print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&modulepart=prelevement&file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+
+ print '</td></tr>';
+
+ // Status
+ print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
+ print '<td>'.$bon->getLibStatut(1).'</td>';
+ print '</tr>';
+
+ if($bon->date_trans <> 0)
+ {
+ $muser = new User($db);
+ $muser->fetch($bon->user_trans);
+
+ print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
+ print dol_print_date($bon->date_trans,'dayhour');
+ print ' / '.$muser->getFullName($langs).'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
+ print $bon->methodes_trans[$bon->method_trans];
+ print '</td></tr>';
+ }
+ if($bon->date_credit <> 0)
+ {
+ print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
+ print dol_print_date($bon->date_credit,'dayhour');
+ print '</td></tr>';
+ }
+
print '</table>';
print '</div>';
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 898ba1c5db26f35d9675849d5622ef6eba75aff1..7a720c2b2aa4252928a7a86f4afa93affa58b5b8 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
- * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@@ -54,6 +54,40 @@ if ($_GET["id"])
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'dayhour').'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
+
+ $relativepath = 'receipts/'.$bon->ref;
+
+ print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&modulepart=prelevement&file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+
+ print '</td></tr>';
+
+ // Status
+ print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
+ print '<td>'.$bon->getLibStatut(1).'</td>';
+ print '</tr>';
+
+ if($bon->date_trans <> 0)
+ {
+ $muser = new User($db);
+ $muser->fetch($bon->user_trans);
+
+ print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
+ print dol_print_date($bon->date_trans,'dayhour');
+ print ' / '.$muser->getFullName($langs).'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
+ print $bon->methodes_trans[$bon->method_trans];
+ print '</td></tr>';
+ }
+ if($bon->date_credit <> 0)
+ {
+ print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
+ print dol_print_date($bon->date_credit,'dayhour');
+ print '</td></tr>';
+ }
+
print '</table>';
print '</div>';
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 8373bf23aaa1ff52b58a204b65b799fdca1a802a..9524469488606ab86deb4252d6f202ca75c1ea85 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -1,7 +1,7 @@
<?PHP
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@@ -27,6 +27,7 @@
require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
+require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php");
// Security check
if ($user->societe_id > 0) accessforbidden();
@@ -55,6 +56,40 @@ if ($prev_id)
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'dayhour').'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
+
+ $relativepath = 'receipts/'.$bon->ref;
+
+ print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&modulepart=prelevement&file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+
+ print '</td></tr>';
+
+ // Status
+ print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
+ print '<td>'.$bon->getLibStatut(1).'</td>';
+ print '</tr>';
+
+ if($bon->date_trans <> 0)
+ {
+ $muser = new User($db);
+ $muser->fetch($bon->user_trans);
+
+ print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
+ print dol_print_date($bon->date_trans,'dayhour');
+ print ' / '.$muser->getFullName($langs).'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
+ print $bon->methodes_trans[$bon->method_trans];
+ print '</td></tr>';
+ }
+ if($bon->date_credit <> 0)
+ {
+ print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
+ print dol_print_date($bon->date_credit,'dayhour');
+ print '</td></tr>';
+ }
+
print '</table>';
@@ -69,6 +104,8 @@ if ($prev_id)
* Stats
*
*/
+ $ligne=new LignePrelevement($db,$user);
+
$sql = "SELECT sum(pl.amount), pl.statut";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql.= " WHERE pl.fk_prelevement_bons = ".$prev_id;
@@ -92,20 +129,8 @@ if ($prev_id)
$row = $db->fetch_row($resql);
print "<tr $bc[$var]><td>";
-
- if ($row[1] == 2)
- {
- print $langs->trans("StatusCredited");
- }
- elseif ($row[1] == 3)
- {
- print $langs->trans("StatusRefused");
- }
- elseif ($row[1] == 1)
- {
- print $langs->trans("StatusWaiting");
- }
- else print $langs->trans("StatusUnknown");
+
+ print $ligne->LibStatut($row[1],1);
print '</td><td align="right">';
print price($row[0]);
diff --git a/htdocs/compta/prelevement/img/statut0.png b/htdocs/compta/prelevement/img/statut0.png
deleted file mode 100644
index 7a8fb19836863bc7b7f7eee1f809db6adf2fc626..0000000000000000000000000000000000000000
Binary files a/htdocs/compta/prelevement/img/statut0.png and /dev/null differ
diff --git a/htdocs/compta/prelevement/img/statut1.png b/htdocs/compta/prelevement/img/statut1.png
deleted file mode 100644
index 134f1b74b305154a2e4ab14812c4ffa37f6c9035..0000000000000000000000000000000000000000
Binary files a/htdocs/compta/prelevement/img/statut1.png and /dev/null differ
diff --git a/htdocs/compta/prelevement/img/statut2.png b/htdocs/compta/prelevement/img/statut2.png
deleted file mode 100644
index 15bb595ba2f9b103432645fc2c6305dc570ebe3c..0000000000000000000000000000000000000000
Binary files a/htdocs/compta/prelevement/img/statut2.png and /dev/null differ
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
index 22a2f5e08f14c358c7b6b2797aaf779f426684b3..a02a8ac307d923ced5e4e4d8ea476f8afea34e69 100644
--- a/htdocs/compta/prelevement/lignes.php
+++ b/htdocs/compta/prelevement/lignes.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
- * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@@ -28,6 +28,7 @@
require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
+require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
@@ -56,7 +57,42 @@ if ($_GET["id"])
print '<table class="border" width="100%">';
+ //print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'dayhour').'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
+
+ $relativepath = 'receipts/'.$bon->ref;
+
+ print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&modulepart=prelevement&file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+
+ print '</td></tr>';
+
+ // Status
+ print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
+ print '<td>'.$bon->getLibStatut(1).'</td>';
+ print '</tr>';
+
+ if($bon->date_trans <> 0)
+ {
+ $muser = new User($db);
+ $muser->fetch($bon->user_trans);
+
+ print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
+ print dol_print_date($bon->date_trans,'dayhour');
+ print ' / '.$muser->getFullName($langs).'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
+ print $bon->methodes_trans[$bon->method_trans];
+ print '</td></tr>';
+ }
+ if($bon->date_credit <> 0)
+ {
+ print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
+ print dol_print_date($bon->date_credit,'dayhour');
+ print '</td></tr>';
+ }
+
print '</table>';
@@ -64,7 +100,7 @@ if ($_GET["id"])
}
else
{
- print "Erreur";
+ dol_print_error($db);
}
}
@@ -72,6 +108,8 @@ $page = $_GET["page"];
$sortorder = $_GET["sortorder"];
$sortfield = $_GET["sortfield"];
+$ligne=new LignePrelevement($db,$user);
+
if ($page == -1) { $page = 0 ; }
$offset = $conf->liste_limit * $page ;
@@ -129,10 +167,7 @@ if ($result)
print "<tr $bc[$var]><td>";
- if ($obj->statut==0) print img_picto($langs->trans("StatusWaiting"),'statut0');
- if ($obj->statut==2) print img_picto($langs->trans("StatusCredited"),'statut4');
- if ($obj->statut==3) print img_picto($langs->trans("StatusRefused"),'statut7');
-
+ print $ligne->LibStatut($obj->statut,2);
print " ";
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php
index a70fa71132a78070c6d717f691b82d844ad35deb..32956d52d0c3f1eb0f72cf3d873ba8105119cca4 100644
--- a/htdocs/compta/prelevement/liste.php
+++ b/htdocs/compta/prelevement/liste.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
+ * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@@ -25,6 +26,8 @@
* \version $Id$
*/
require('../../main.inc.php');
+require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
+require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php");
$langs->load("withdrawals");
$langs->load("companies");
@@ -35,6 +38,9 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:'';
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'prelevement','','','bons');
+$bon=new BonPrelevement($db,"");
+$ligne=new LignePrelevement($db,$user);
+
$page = $_GET["page"];
$sortorder = (empty($_GET["sortorder"])) ? "DESC" : $_GET["sortorder"];
$sortfield = (empty($_GET["sortfield"])) ? "p.datec" : $_GET["sortfield"];
@@ -131,9 +137,7 @@ if ($result)
print "<tr $bc[$var]><td>";
- if ($obj->statut_ligne==0) print img_picto($langs->trans("StatusWaiting"),'statut0');
- if ($obj->statut_ligne==2) print img_picto($langs->trans("StatusCredited"),'statut4');
- if ($obj->statut_ligne==3) print img_picto($langs->trans("StatusRefused"),'statut7');
+ print $ligne->LibStatut($obj->statut_ligne,2);
print " ";
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid_ligne.'">';
@@ -142,9 +146,7 @@ if ($result)
print '<td>';
- if ($obj->statut==0) print img_picto($langs->trans("StatusWaiting"),'statut0');
- if ($obj->statut==1) print img_picto($langs->trans("StatusTrans"),'statut1');
- if ($obj->statut==2) print img_picto($langs->trans("StatusCredited"),'statut4');
+ print $bon->LibStatut($obj->statut,2);
print " ";
print '<a href="fiche.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 987dd6bffcc6dd8f24d9ac60d21ef47298fa5601..455f0f6e21dda74995424007ba346c02fa1f4eb9 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
- * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@@ -26,6 +26,7 @@
*/
require('../../main.inc.php');
+require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php");
$langs->load("withdrawals");
$langs->load("companies");
@@ -69,6 +70,8 @@ if ($resql)
/*
* Stats
*/
+$ligne=new LignePrelevement($db,$user);
+
$sql = "SELECT sum(pl.amount), count(pl.amount), pl.statut";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -90,18 +93,14 @@ if ($resql)
$var=True;
- $st[0] = $langs->trans("StatusWaiting");
- $st[1] = $langs->trans("StatusWaiting");
- $st[2] = $langs->trans("StatusCredited");
- $st[3] = $langs->trans("StatusRefused");
-
while ($i < $num)
{
$row = $db->fetch_row($resql);
print "<tr $bc[$var]><td>";
- print $st[$row[2]];
+ print $ligne->LibStatut($row[2],1);
+ //print $st[$row[2]];
print '</td><td align="center">';
print $row[1];
diff --git a/htdocs/compta/prelevement/img/statut3.png b/htdocs/theme/auguria/img/statut8.png
old mode 100644
new mode 100755
similarity index 100%
rename from htdocs/compta/prelevement/img/statut3.png
rename to htdocs/theme/auguria/img/statut8.png
diff --git a/htdocs/theme/bureau2crea/img/statut8.png b/htdocs/theme/bureau2crea/img/statut8.png
new file mode 100755
index 0000000000000000000000000000000000000000..4d8f59be1c226e76c2ddc5a89f5bde2f7de5da8e
Binary files /dev/null and b/htdocs/theme/bureau2crea/img/statut8.png differ
diff --git a/htdocs/theme/eldy/img/statut8.png b/htdocs/theme/eldy/img/statut8.png
new file mode 100755
index 0000000000000000000000000000000000000000..4d8f59be1c226e76c2ddc5a89f5bde2f7de5da8e
Binary files /dev/null and b/htdocs/theme/eldy/img/statut8.png differ
diff --git a/htdocs/theme/freelug/img/statut8.png b/htdocs/theme/freelug/img/statut8.png
new file mode 100755
index 0000000000000000000000000000000000000000..4d8f59be1c226e76c2ddc5a89f5bde2f7de5da8e
Binary files /dev/null and b/htdocs/theme/freelug/img/statut8.png differ
diff --git a/htdocs/theme/yellow/img/statut8.png b/htdocs/theme/yellow/img/statut8.png
new file mode 100755
index 0000000000000000000000000000000000000000..4d8f59be1c226e76c2ddc5a89f5bde2f7de5da8e
Binary files /dev/null and b/htdocs/theme/yellow/img/statut8.png differ