From a8541f00e53b2aebc80643d060dccec0aa25afe7 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Sat, 23 Dec 2006 10:39:19 +0000 Subject: [PATCH] Nouvelle presentation de la page index et liste avec icones --- htdocs/compta/paiement/cheque/index.php | 117 ++++++++-------------- htdocs/compta/paiement/cheque/liste.php | 4 +- htdocs/compta/paiement/cheque/statut0.png | Bin 0 -> 227 bytes htdocs/compta/paiement/cheque/statut1.png | Bin 0 -> 193 bytes 4 files changed, 44 insertions(+), 77 deletions(-) create mode 100644 htdocs/compta/paiement/cheque/statut0.png create mode 100644 htdocs/compta/paiement/cheque/statut1.png diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 24f35999372..a713e26a718 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -30,10 +30,10 @@ require("./pre.inc.php"); $langs->load("banks"); -$user->getrights("facture"); +$user->getrights("banque"); // Sécurité accés client -if (! $user->rights->facture->lire) +if (! $user->rights->banque) accessforbidden(); $socid=0; @@ -51,9 +51,41 @@ llxHeader('',$langs->trans("CheckReceipt")); print_titre($langs->trans("CheckReceipt") ); -print '
'; +print '\n"; +print '\n"; -print '"; - print ''; + print ''; print ''; diff --git a/htdocs/compta/paiement/cheque/statut0.png b/htdocs/compta/paiement/cheque/statut0.png new file mode 100644 index 0000000000000000000000000000000000000000..ae1f93d39063ab9eb97d92b25dbc3d6cc786b5e7 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v_d#0*}aI zppNSd417lz6&q7F0|nVjJbhi+uW(E8YRS~?Ep!J8$(FcAlsM<-=BDPAFgO>bCYGe8 zD3oWGWGIAWq$;?3`UbpDQOyG?boX>|4AD40^^!Fog8~Q3#mL8h*Y~t`9@9@?J}Rxn zD$yDKo5Ms+V9JHa%MspezYn(kKghbjnSCF-d<`34TrbP0l+XkKI)Fr2 literal 0 HcmV?d00001 diff --git a/htdocs/compta/paiement/cheque/statut1.png b/htdocs/compta/paiement/cheque/statut1.png new file mode 100644 index 0000000000000000000000000000000000000000..15bb595ba2f9b103432645fc2c6305dc570ebe3c GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v_d#0*}aI zppNSd417lz6&q7F0|nVjJbhi+uW+$)GD}u8-Dv{~$(FcAlsM<-=BDPAFgO>bCYGe8 zD3oWGWGIAWq$;?3`UbpDQOyG?RP}Um45_%4oRX06
'; -$sql = "SELECT bc.rowid,".$db->pdate("bc.date_bordereau")." as db, bc.amount,"; +$sql = "SELECT count(b.rowid)"; +$sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; +$sql.= " WHERE b.fk_type = 'CHQ'AND b.fk_bordereau = 0"; +$sql.= " AND b.amount > 0"; + +$resql = $db->query($sql); + +print ''; +print ''; +print '\n"; +print "\n"; + +if ($resql) +{ + $var=true; + if ($row = $db->fetch_row($resql) ) + { + $num = $row[0]; + } + print ""; + print ''; + print ''; + print "
'.$langs->trans("BankChecks")."
'.$langs->trans("BankChecksToReceipt").''.$num.'
\n"; +} +else +{ + dolibarr_print_error($db); +} + +print "		'; + +$sql = "SELECT bc.rowid,".$db->pdate("bc.date_bordereau")." as db, bc.amount,bc.number,"; $sql.= " bc.statut, ba.label, ba.rowid as bid"; $sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc"; $sql.= ",".MAIN_DB_PREFIX."bank_account as ba"; @@ -64,10 +96,9 @@ $resql = $db->query($sql); if ($resql) { - $i = 0; - print ''; print '"; + print ''; print ''; print ''; print "\n"; @@ -78,82 +109,16 @@ if ($resql) $var=!$var; print "\n"; print ''; - - print ''; + print ''; print ''; - $i++; - } - print "
'.$langs->trans("Date")."'.$langs->trans("Numero").''.$langs->trans("Account").''.$langs->trans("Amount").'
'; + print 'Statut '; print ''; print dolibarr_print_date($objp->db,'%d/%m').''; - print ''.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.''; - + print ''.$objp->number.''.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.''; print ''.price($objp->amount).'
"; -} -else -{ - dolibarr_print_error($db); -} - -print "		'; - -$page=$_GET["page"]; -$sortorder=$_GET["sortorder"]; -$sortfield=$_GET["sortfield"]; - -$limit = $conf->liste_limit; -$offset = $limit * $page ; -if (! $sortorder) $sortorder="DESC"; -if (! $sortfield) $sortfield="p.rowid"; - -$sql = "SELECT b.amount,b.emetteur,".$db->pdate("b.dateo")." as date,"; -$sql.= " c.code as paiement_code,"; -$sql.= " ba.rowid as bid, ba.label"; -$sql.= " FROM ".MAIN_DB_PREFIX."c_paiement as c"; -$sql.= ",".MAIN_DB_PREFIX."bank as b"; -$sql.= ",".MAIN_DB_PREFIX."bank_account as ba"; -$sql.= " WHERE c.code = 'CHQ' AND c.code = b.fk_type AND b.fk_bordereau = 0 AND b.fk_account = ba.rowid"; -$sql.= " AND b.amount > 0"; -//$sql .= " ORDER BY $sortfield $sortorder"; -$sql .= $db->plimit( $limit+1 ,$offset); -//print "$sql"; - -$resql = $db->query($sql); - -if ($resql) -{ - $num = $db->num_rows($resql); - $i = 0; - - $paramlist=($_GET["orphelins"]?"&orphelins=1":""); - - print ''; - print ''; - print '\n"; - print '\n"; - print '\n"; - print '\n"; - - print "\n"; - - $var=true; - while ($i < min($num,$limit)) - { - $objp = $db->fetch_object($resql); - $var=!$var; - print ""; - print ''; - print ''; - print ''; - print ''; - $i++; } print "
'.$langs->trans("Date")."'.$langs->trans("Account")."'.$langs->trans("Amount")."'.$langs->trans("CheckTransmitter")."
'.dolibarr_print_date($objp->date).''; - - if ($objp->bid) print ''.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.''; - else print ' '; - print ''.price($objp->amount).''.$objp->emetteur.'
"; + $db->free($resql); } else { diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php index 1a3180635e5..c69598b9851 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -110,7 +110,9 @@ if ($resql) $objp = $db->fetch_object($resql); $var=!$var; print "
'.$objp->number.''; + print 'Statut '; + print ''.$objp->number.''.dolibarr_print_date($objp->dp).'