From 17177494991061733e86ce252b68bbaf9e41cdd7 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 5 Jan 2011 09:57:55 +0000 Subject: [PATCH] Withdrawals: Visual enhancements --- htdocs/compta/prelevement/bons.php | 10 +++- .../class/ligne-prelevement.class.php | 8 +-- htdocs/compta/prelevement/factures.php | 36 +++++++++++- htdocs/compta/prelevement/fiche-rejet.php | 36 +++++++++++- htdocs/compta/prelevement/fiche-stat.php | 55 +++++++++++++----- htdocs/compta/prelevement/img/statut0.png | Bin 198 -> 0 bytes htdocs/compta/prelevement/img/statut1.png | Bin 197 -> 0 bytes htdocs/compta/prelevement/img/statut2.png | Bin 193 -> 0 bytes htdocs/compta/prelevement/lignes.php | 47 +++++++++++++-- htdocs/compta/prelevement/liste.php | 14 +++-- htdocs/compta/prelevement/stats.php | 13 ++--- .../auguria/img/statut8.png} | Bin htdocs/theme/bureau2crea/img/statut8.png | Bin 0 -> 193 bytes htdocs/theme/eldy/img/statut8.png | Bin 0 -> 193 bytes htdocs/theme/freelug/img/statut8.png | Bin 0 -> 193 bytes htdocs/theme/yellow/img/statut8.png | Bin 0 -> 193 bytes 16 files changed, 177 insertions(+), 42 deletions(-) delete mode 100644 htdocs/compta/prelevement/img/statut0.png delete mode 100644 htdocs/compta/prelevement/img/statut1.png delete mode 100644 htdocs/compta/prelevement/img/statut2.png rename htdocs/{compta/prelevement/img/statut3.png => theme/auguria/img/statut8.png} (100%) mode change 100644 => 100755 create mode 100755 htdocs/theme/bureau2crea/img/statut8.png create mode 100755 htdocs/theme/eldy/img/statut8.png create mode 100755 htdocs/theme/freelug/img/statut8.png create mode 100755 htdocs/theme/yellow/img/statut8.png diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index f782da8e38f..78ce041b684 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -2,6 +2,7 @@ /* Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2005-2008 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2010-2011 Juanjo Menent * * 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 ""; - print ' '; - + + print $bon->LibStatut($obj->statut,2); + print " "; + print ''.$obj->ref."\n"; print ''.dol_print_date($db->jdate($obj->datec),'day')."\n"; diff --git a/htdocs/compta/prelevement/class/ligne-prelevement.class.php b/htdocs/compta/prelevement/class/ligne-prelevement.class.php index dd0657be34e..5fdd8a37cc2 100644 --- a/htdocs/compta/prelevement/class/ligne-prelevement.class.php +++ b/htdocs/compta/prelevement/class/ligne-prelevement.class.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2010-2011 Juanjo Menent * * 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 96253098537..f10c66363b4 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2005 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2010-2011 Juanjo Menent * * 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 ''; print ''; + print ''; + print ''; + print ''; + + // Status + print ''; + print ''; + print ''; + + if($bon->date_trans <> 0) + { + $muser = new User($db); + $muser->fetch($bon->user_trans); + + print ''; + print ''; + } + if($bon->date_credit <> 0) + { + print ''; + } + print '
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'dayhour').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("File").''; + + $relativepath = 'receipts/'.$bon->ref; + + print ''.$relativepath.''; + + print '
'.$langs->trans('Status').''.$bon->getLibStatut(1).'
'.$langs->trans("TransData").''; + print dol_print_date($bon->date_trans,'dayhour'); + print ' / '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; + print $bon->methodes_trans[$bon->method_trans]; + print '
'.$langs->trans('CreditDate').''; + print dol_print_date($bon->date_credit,'dayhour'); + print '
'; print ''; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 898ba1c5db2..7a720c2b2aa 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2005 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin - * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2010-2011 Juanjo Menent * * 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 ''; print ''; + print ''; + print ''; + print ''; + + // Status + print ''; + print ''; + print ''; + + if($bon->date_trans <> 0) + { + $muser = new User($db); + $muser->fetch($bon->user_trans); + + print ''; + print ''; + } + if($bon->date_credit <> 0) + { + print ''; + } + print '
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'dayhour').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("File").''; + + $relativepath = 'receipts/'.$bon->ref; + + print ''.$relativepath.''; + + print '
'.$langs->trans('Status').''.$bon->getLibStatut(1).'
'.$langs->trans("TransData").''; + print dol_print_date($bon->date_trans,'dayhour'); + print ' / '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; + print $bon->methodes_trans[$bon->method_trans]; + print '
'.$langs->trans('CreditDate').''; + print dol_print_date($bon->date_credit,'dayhour'); + print '
'; print ''; diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 8373bf23aaa..95244694886 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -1,7 +1,7 @@ * Copyright (C) 2005 Laurent Destailleur - * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2010-2011 Juanjo Menent * * 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 ''; print ''; + print ''; + print ''; + print ''; + + // Status + print ''; + print ''; + print ''; + + if($bon->date_trans <> 0) + { + $muser = new User($db); + $muser->fetch($bon->user_trans); + + print ''; + print ''; + } + if($bon->date_credit <> 0) + { + print ''; + } + print '
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'dayhour').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("File").''; + + $relativepath = 'receipts/'.$bon->ref; + + print ''.$relativepath.''; + + print '
'.$langs->trans('Status').''.$bon->getLibStatut(1).'
'.$langs->trans("TransData").''; + print dol_print_date($bon->date_trans,'dayhour'); + print ' / '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; + print $bon->methodes_trans[$bon->method_trans]; + print '
'.$langs->trans('CreditDate').''; + print dol_print_date($bon->date_credit,'dayhour'); + print '
'; @@ -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 ""; - - 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 ''; 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 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!`~4GjPP3v~Pgif|Tq zL>2>eTxVe5JHn{gn6eot$X?><>&kwGi=9VV&|ki)3@9X9;u=xnoS&PUnpeW$T$Gwv zlA5AWo>`Ki5R#Fq;O^-g@IFN~52#Sf)5S5Q;#P7>Lc)*p4onG&2|&jG`4+Z4Jv}@= lJSt6ryv@$c$}2sY87}9risv)*uLbI2@O1TaS?83{1OPk+H@pA< diff --git a/htdocs/compta/prelevement/img/statut1.png b/htdocs/compta/prelevement/img/statut1.png deleted file mode 100644 index 134f1b74b305154a2e4ab14812c4ffa37f6c9035..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v_d#0*}aI zppNSd417lz6&q7F0|nVjJbhi+uW+$)vg%Z1?^gy2$(FcAlsM<-=BDPAFgO>bCYGe8 zD3oWGWGIAWq$;?3`UbpDQOyG?)bw<545_%4oRX06bCYGe8 zD3oWGWGIAWq$;?3`UbpDQOyG?RP}Um45_%4oRX06 * Copyright (C) 2005 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2010-2011 Juanjo Menent * * 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 ''; + //print ''; print ''; + print ''; + print ''; + print ''; + + // Status + print ''; + print ''; + print ''; + + if($bon->date_trans <> 0) + { + $muser = new User($db); + $muser->fetch($bon->user_trans); + + print ''; + print ''; + } + if($bon->date_credit <> 0) + { + print ''; + } + print '
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'dayhour').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("File").''; + + $relativepath = 'receipts/'.$bon->ref; + + print ''.$relativepath.''; + + print '
'.$langs->trans('Status').''.$bon->getLibStatut(1).'
'.$langs->trans("TransData").''; + print dol_print_date($bon->date_trans,'dayhour'); + print ' / '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; + print $bon->methodes_trans[$bon->method_trans]; + print '
'.$langs->trans('CreditDate').''; + print dol_print_date($bon->date_credit,'dayhour'); + print '
'; @@ -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 ""; - 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 ''; diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index a70fa71132a..32956d52d0c 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -2,6 +2,7 @@ /* Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2010-2011 Juanjo Menent * * 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 ""; - 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 ''; @@ -142,9 +146,7 @@ if ($result) print ''; - 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 ''.$obj->ref."\n"; diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index 987dd6bffcc..455f0f6e21d 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2010-2011 Juanjo Menent * * 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 ""; - print $st[$row[2]]; + print $ligne->LibStatut($row[2],1); + //print $st[$row[2]]; print ''; 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 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v_d#0*}aI zppNSd417lz6&q7F0|nVjJbhi+uW+&RC~7F_O!xy7k}YwKC~?lu%}vcKVQ?-=O)N=G zQ7F$W$xsN%NL6t6^bL5QqM8R(sOstB7*cU7IVB