diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index 1633ec8a76f..27c9a96dc7c 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -28,6 +28,8 @@ require('./pre.inc.php'); require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/remisecheque.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); $user->getrights('banque'); @@ -131,7 +133,7 @@ if ($_GET['action'] == 'new') { $h=0; $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/cheque/fiche.php?action=new'; - $head[$h][1] = $langs->trans("NewCheckReceipt"); + $head[$h][1] = $langs->trans("NewCheckDeposit"); $hselected = $h; $h++; @@ -182,147 +184,165 @@ if ($mesg) print $mesg.'
'; */ if ($_GET['action'] == 'new') { - $accounts = array(); - $lines = array(); - - print ''; - print ''; - print '
'.$langs->trans('Date').''.dolibarr_print_date(time()).'

'; - - $sql = "SELECT ba.rowid as bid, ".$db->pdate("b.dateo")." as date,"; - $sql.= " b.amount, ba.label, b.emetteur, b.banque"; - $sql.= " FROM ".MAIN_DB_PREFIX."bank as b "; - $sql.= ",".MAIN_DB_PREFIX."bank_account as ba "; - $sql.= " WHERE b.fk_type = 'CHQ' AND b.fk_account = ba.rowid"; - $sql.= " AND b.fk_bordereau = 0 AND b.amount > 0"; - $sql.= " ORDER BY b.emetteur ASC, b.rowid ASC;"; - - $resql = $db->query($sql); - - if ($resql) - { - $i = 0; - while ( $obj = $db->fetch_object($resql) ) + $accounts = array(); + $lines = array(); + + print ''; + print ''; + print '
'.$langs->trans('Date').''.dolibarr_print_date(time()).'

'; + + $sql = "SELECT ba.rowid as bid, ".$db->pdate("b.dateo")." as date,"; + $sql.= " b.amount, ba.label, b.emetteur, b.banque"; + $sql.= " FROM ".MAIN_DB_PREFIX."bank as b "; + $sql.= ",".MAIN_DB_PREFIX."bank_account as ba "; + $sql.= " WHERE b.fk_type = 'CHQ' AND b.fk_account = ba.rowid"; + $sql.= " AND b.fk_bordereau = 0 AND b.amount > 0"; + $sql.= " ORDER BY b.emetteur ASC, b.rowid ASC;"; + + $resql = $db->query($sql); + + if ($resql) { - $accounts[$obj->bid] = $obj->label; - $lines[$obj->bid][$i]["date"] = $obj->date; - $lines[$obj->bid][$i]["amount"] = $obj->amount; - $lines[$obj->bid][$i]["emetteur"] = $obj->emetteur; - $lines[$obj->bid][$i]["banque"] = $obj->banque; - $i++; + $i = 0; + while ( $obj = $db->fetch_object($resql) ) + { + $accounts[$obj->bid] = $obj->label; + $lines[$obj->bid][$i]["date"] = $obj->date; + $lines[$obj->bid][$i]["amount"] = $obj->amount; + $lines[$obj->bid][$i]["emetteur"] = $obj->emetteur; + $lines[$obj->bid][$i]["banque"] = $obj->banque; + $i++; + } + + if ($i == 0) + { + print $langs->trans("NoWaitingChecks").'
'; + } } - } - - foreach ($accounts as $bid => $account_label) - { - $num = $db->num_rows($resql); - - print ''; - print ''; - print '\n"; - print '\n"; - print '\n"; - print '\n"; - print "\n"; - - $var=true; - - foreach ($lines[$bid] as $lid => $value) + + foreach ($accounts as $bid => $account_label) { - $var=!$var; + $num = $db->num_rows($resql); - $account_id = $objp->bid; - $accounts[$objp->bid] += 1; - - print ""; - print ''; - print '\n"; - print '\n"; - print ''; - print ''; - $i++; + print '
'.$langs->trans("Date")."'.$langs->trans("CheckTransmitter")."'.$langs->trans("Bank")."'.$langs->trans("Amount")."
'.dolibarr_print_date($value["date"]).''.stripslashes($value["emetteur"])."'.stripslashes($value["banque"])."'.price($value["amount"]).'
'; + print ''; + print '\n"; + print '\n"; + print '\n"; + print '\n"; + print "\n"; + + $var=true; + + foreach ($lines[$bid] as $lid => $value) + { + $var=!$var; + + $account_id = $objp->bid; + $accounts[$objp->bid] += 1; + + print ""; + print ''; + print '\n"; + print '\n"; + print ''; + print ''; + $i++; + } + print "
'.$langs->trans("Date")."'.$langs->trans("CheckTransmitter")."'.$langs->trans("Bank")."'.$langs->trans("Amount")."
'.dolibarr_print_date($value["date"]).''.$value["emetteur"]."'.$value["banque"]."'.price($value["amount"]).'
"; + + print '
'; + print ''; + print $langs->trans('NewCheckDepositOn',$account_label); + print ''; + print '

'; } - print ""; - - print '
'; - print ''; - print $langs->trans('NewCheckReceipt'); - print ' : '.stripslashes($account_label).''; - print '

'; - } } else { - $remise->load_previous_next_id(); - $previous_id = $remise->previous_id ? ''.img_previous().'':''; - $next_id = $remise->next_id ? ''.img_next().'':''; + $accountstatic=new Account($db); + + $accountstatic->id=$remise->account_id; + $accountstatic->label=$remise->account_label; - print ''; - print '\n"; + $remise->load_previous_next_id(); + $previous_id = $remise->previous_id ? ''.img_previous().'':''; + $next_id = $remise->next_id ? ''.img_next().'':''; - print ''; - print ''; + print '
'.$langs->trans('Numero').''.$remise->number.''; - print $previous_id.' '.$next_id; - print "
'.$langs->trans('Date').''.dolibarr_print_date($remise->date_bordereau).'
'.$langs->trans('Account').''; - print ''.img_object($langs->trans("ShowAccount"),'account').' '.$remise->account_label.''; - print '
'; + print '\n"; - print ''; + print ''; - print '
'.$langs->trans('Numero').''.$remise->number.''; + print $previous_id.' '.$next_id; + print "
'.$langs->trans('Total').''; - print price($remise->amount); - print '
'.$langs->trans('Date').''.dolibarr_print_date($remise->date_bordereau).'

'; + print ''.$langs->trans('Account').''; + print $accountstatic->getNomUrl(1); + print ''; - $sql = "SELECT b.amount,b.emetteur,".$db->pdate("b.dateo")." as date,b.rowid,b.banque,"; - $sql.= " ba.rowid as bid, ba.label"; - $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; - $sql.= ",".MAIN_DB_PREFIX."bank_account as ba"; - $sql.= " WHERE b.fk_type= 'CHQ' AND b.fk_account = ba.rowid"; - $sql.= " AND b.fk_bordereau = ".$remise->id; - $sql.= " ORDER BY b.emetteur ASC, b.rowid ASC"; + print ''.$langs->trans('Total').''; + print price($remise->amount); + print ''; - $resql = $db->query($sql); - - if ($resql) - { - $num = $db->num_rows($resql); - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - $i=1; - $var=false; - while ( $objp = $db->fetch_object($resql) ) + print '
#'.$langs->trans("CheckTransmitter").''.$langs->trans("Bank").''.$langs->trans("Amount").' 

'; + + $sql = "SELECT b.amount,b.emetteur,".$db->pdate("b.dateo")." as date,b.rowid,b.banque,"; + $sql.= " ba.rowid as bid, ba.label"; + $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; + $sql.= ",".MAIN_DB_PREFIX."bank_account as ba"; + $sql.= " WHERE b.fk_type= 'CHQ' AND b.fk_account = ba.rowid"; + $sql.= " AND b.fk_bordereau = ".$remise->id; + $sql.= " ORDER BY b.emetteur ASC, b.rowid ASC"; + + $resql = $db->query($sql); + + if ($resql) { - $account_id = $objp->bid; - $accounts[$objp->bid] += 1; + $num = $db->num_rows($resql); - print "$i"; - print ''.stripslashes($objp->emetteur).''; - print ''.stripslashes($objp->banque).''; - print ''.price($objp->amount).''; - if($remise->statut == 0) - { - print ''.img_delete().''; - } - else - { - print ' '; - } - print ''; - $var=!$var; - $i++; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + $i=1; + $var=false; + while ( $objp = $db->fetch_object($resql) ) + { + $account_id = $objp->bid; + $accounts[$objp->bid] += 1; + + print ""; + print ''; + print ''; + print ''; + if($remise->statut == 0) + { + print ''; + } + else + { + print ''; + } + print ''; + $var=!$var; + $i++; + } + print "
#'.$langs->trans("CheckTransmitter").''.$langs->trans("Bank").''.$langs->trans("Amount").' 
$i'.$objp->emetteur.''.$objp->banque.''.price($objp->amount).''.img_delete().' 
"; + } + else + { + dolibarr_print_error($db); } - print "
"; - } - else - { - dolibarr_print_error($db); - } +} + +print ''; + +if ($_GET['action'] != 'new') +{ if ($remise->statut == 1) { //show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$modelliste=array(),$forcenomultilang=0); @@ -332,9 +352,6 @@ else } } -print ''; - - /* * Boutons Actions */ @@ -358,6 +375,7 @@ if ($user->societe_id == 0 && $remise->statut == 0 && $_GET['action'] == '') } print ''; + $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index c8b08820ad7..371792d147e 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -27,6 +27,8 @@ */ require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/remisecheque.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); $langs->load("banks"); @@ -43,15 +45,21 @@ if ($user->societe_id > 0) $socid = $user->societe_id; } +$checkdepositstatic=new RemiseCheque($db); +$accountstatic=new Account($db); + + /* * Affichage */ llxHeader('',$langs->trans("CheckReceipt")); -print_titre($langs->trans("CheckReceipt") ); +print_fiche_titre($langs->trans("CheckReceipt") ); -print '\n"; -print '
'; +print ''; + +print '\n"; if ($resql) { - $var=true; + $var=false; if ($row = $db->fetch_row($resql) ) { $num = $row[0]; } - print ""; + print ""; print ''; print ''; print "
'; $sql = "SELECT count(b.rowid)"; $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; @@ -67,12 +75,12 @@ print "
'.$langs->trans("BankChecksToReceipt").''.$num.'
\n"; @@ -82,8 +90,9 @@ else dolibarr_print_error($db); } -print "
'; + +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"; @@ -96,35 +105,41 @@ $resql = $db->query($sql); if ($resql) { - print ''; - print '"; - print ''; - print ''; - print ''; - print "\n"; - - $var=true; - while ( $objp = $db->fetch_object($resql) ) - { - $var=!$var; - print "\n"; - print ''; - if ($objp->statut == 1) + print '
'.$langs->trans("Date")."'.$langs->trans("Numero").''.$langs->trans("Account").''.$langs->trans("Amount").'
'; - print 'Statut '; - print dolibarr_print_date($objp->db,'%d/%m').'
'; + print '"; + print ''; + print ''; + print ''; + print ''; + print "\n"; + + $var=true; + while ( $objp = $db->fetch_object($resql) ) { - print ''; + $checkdepositstatic->statut=$objp->statut; + $checkdepositstatic->rowid=$objp->rowid; + $checkdepositstatic->number=$objp->number; + + $accountstatic->id=$objp->bid; + $accountstatic->label=$objp->label; + + $var=!$var; + print "\n"; + + print ''; + + print ''; + + print ''; + + print ''; + + print ''; + + print ''; } - else - { - print ''; - } - print ''; - print ''; - } - print "
'.$langs->trans("Date")."'.$langs->trans("Numero").''.$langs->trans("Account").''.$langs->trans("Amount").''.$langs->trans("Status").'
'.$objp->number.'
'.dolibarr_print_date($objp->db,'day').''.$checkdepositstatic->getNomUrl(1).''.$accountstatic->getNomUrl(1).''.price($objp->amount).''.$checkdepositstatic->LibStatut($objp->statut,3).'
(PROV'.$objp->rowid.')'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.''; - print ''.price($objp->amount).'
"; - $db->free($resql); + print "
"; + $db->free($resql); } else { diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php index 6c4209e580b..ae86661290d 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -1,5 +1,6 @@ + * Copyright (C) 2007 Laurent Destailleur * * 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 +28,8 @@ */ require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/remisecheque.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); $langs->load("bills"); @@ -43,13 +46,6 @@ if ($user->societe_id > 0) $socid = $user->societe_id; } - -/* - * Affichage - */ - -llxHeader('',$langs->trans("CheckReceipt")); - $page=$_GET["page"]; $sortorder=$_GET["sortorder"]; $sortfield=$_GET["sortfield"]; @@ -58,18 +54,26 @@ $limit = $conf->liste_limit; $offset = $limit * $page ; if (! $sortorder) $sortorder="DESC"; if (! $sortfield) $sortfield="bc.rowid"; - + +$checkdepositstatic=new RemiseCheque($db); +$accountstatic=new Account($db); + + +/* + * Affichage + */ + +llxHeader('',$langs->trans("CheckReceipt")); + $sql = "SELECT bc.rowid, bc.number, ".$db->pdate("bc.date_bordereau") ." as dp, bc.amount, bc.statut,"; $sql.= " ba.rowid as bid, ba.label"; $sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc"; $sql.= ",".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE bc.fk_bank_account = ba.rowid"; - if ($_GET["search_montant"]) { $sql .=" AND p.amount=".price2num($_GET["search_montant"]); } - $sql .= " ORDER BY $sortfield $sortorder"; $sql .= $db->plimit( $limit+1 ,$offset); //print "$sql"; @@ -90,7 +94,7 @@ if ($resql) print_liste_field_titre($langs->trans("Date"),"liste.php","dp","",$paramlist,'align="center"',$sortfield); print_liste_field_titre($langs->trans("Account"),"liste.php","ba.label","",$paramlist,"",$sortfield); print_liste_field_titre($langs->trans("Amount"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield); - print_liste_field_titre($langs->trans("Status"),"liste.php","p.statut","",$paramlist,'align="center"',$sortfield); + print_liste_field_titre($langs->trans("Status"),"liste.php","p.statut","",$paramlist,'align="right"',$sortfield); print "\n"; // Lignes des champs de filtre @@ -109,26 +113,34 @@ if ($resql) $objp = $db->fetch_object($resql); $var=!$var; print ""; + + // Num ref cheque print ''; - print 'Statut '; - print ''.$objp->number.''; + $checkdepositstatic->rowid=$objp->rowid; + $checkdepositstatic->statut=$objp->statut; + $checkdepositstatic->number=$objp->number; + print $checkdepositstatic->getNomUrl(1); + print ''; + + // Date print ''.dolibarr_print_date($objp->dp).''; + // Banque print ''; if ($objp->bid) print ''.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.''; else print ' '; print ''; + + // Montant print ''.price($objp->amount).''; - print ''; + // Statut + print ''; if ($objp->statut == 0) { print ''.$langs->trans("ToValidate").''; } - else - { - print img_tick(); - } + print $checkdepositstatic->LibStatut($objp->statut,5); print "\n"; $i++; } diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index 923214e3ccb..997f041fdb3 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -38,7 +38,7 @@ function llxHeader($head = "", $title="") $menu->add("/compta/paiement/liste.php",$langs->trans("Payments")); $menu->add(DOL_URL_ROOT."/compta/paiement/cheque/index.php",$langs->trans("CheckReceipt")); - $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?action=new",$langs->trans("New")); + $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?action=new",$langs->trans("NewCheckDeposit")); $menu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php",$langs->trans("List")); $menu->add(DOL_URL_ROOT."/compta/paiement/rapport.php",$langs->trans("Reportings")); diff --git a/htdocs/compta/paiement/cheque/remisecheque.class.php b/htdocs/compta/paiement/cheque/remisecheque.class.php index 9377c0c563e..5a5352e8037 100644 --- a/htdocs/compta/paiement/cheque/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/remisecheque.class.php @@ -1,5 +1,6 @@ + * Copyright (C) 2007 Laurent Destailleur * * 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 @@ -17,25 +18,24 @@ * * $Id$ * $Source$ - * */ /** - \file htdocs/compta/paiement/cheque/resimecheque.class.php - \ingroup compta - \brief Fichier de la classe des bordereau de remise de cheque - \version $Revision$ + \file htdocs/compta/paiement/cheque/resimecheque.class.php + \ingroup compta + \brief Fichier de la classe des bordereau de remise de cheque + \version $Revision$ */ /** - \class RemiseCheque - \brief Classe permettant la gestion des remises de cheque + \class RemiseCheque + \brief Classe permettant la gestion des remises de cheque */ class RemiseCheque { - var $db ; - var $id ; + var $db; + var $id; var $num; var $intitule; //! Numero d'erreur Plage 1024-1279 @@ -47,9 +47,10 @@ class RemiseCheque * \param id id compte (0 par defaut) */ - function RemiseCheque($DB) + function RemiseCheque($DB,$langs='') { $this->db = $DB; + $this->langs = $langs; $this->next_id = 0; $this->previous_id = 0; } @@ -498,5 +499,82 @@ class RemiseCheque return $this->errno; } + + /** + * \brief Renvoie nom clicable (avec eventuellement le picto) + * \param withpicto Inclut le picto dans le lien + * \param option Sur quoi pointe le lien + * \return string Chaine avec URL + */ + function getNomUrl($withpicto=0,$option='') + { + global $langs; // TODO Renvoyer le libellé anglais et faire traduction a affichage + + $result=''; + + $number=$this->number; + if ($this->statut == 0) $number='(PROV'.$this->rowid.')'; + + $lien = ''; + $lienfin=''; + + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCheckReceipt"),'payment').$lienfin.' '); + $result.=$lien.$number.$lienfin; + return $result; + } + + /** + * \brief Retourne le libellé du statut d'une facture (brouillon, validée, abandonnée, payée) + * \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court, 3=Picto, 4=Picto + Libellé long, 5=Libellé court + Picto + * \return string Libelle + */ + function getLibStatut($mode=0) + { + return $this->LibStatut($this->statut,$mode); + } + + /** + * \brief Renvoi le libellé d'un statut donne + * \param status Statut + * \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court, 3=Picto, 4=Picto + Libellé long, 5=Libellé court + Picto + * \return string Libellé du statut + */ + function LibStatut($status,$mode=0) + { + global $langs; // TODO Renvoyer le libellé anglais et faire traduction a affichage + $langs->load('compta'); + if ($mode == 0) + { + if ($status == 0) return $langs->trans('ToValidate'); + if ($status == 1) return $langs->trans('Validated'); + } + if ($mode == 1) + { + if ($status == 0) return $langs->trans('ToValidate'); + if ($status == 1) return $langs->trans('Validated'); + } + if ($mode == 2) + { + if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate'); + if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated'); + } + if ($mode == 3) + { + if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1'); + if ($status == 1) return img_picto($langs->trans('Validated'),'statut4'); + } + if ($mode == 4) + { + if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate'); + if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated'); + } + if ($mode == 5) + { + if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1'); + if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4'); + } + return $langs->trans('Unknown'); + } + } ?> diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index eb5ad4f5715..188084ad152 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2007 Laurent Destailleur * * 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,8 @@ */ require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php'); $langs->load("bills"); @@ -44,6 +46,10 @@ if ($user->societe_id > 0) $socid = $user->societe_id; } +$paymentstatic=new Paiement($db); +$accountstatic=new Account($db); + + /* * Affichage */ @@ -103,67 +109,76 @@ $resql = $db->query($sql); if ($resql) { - $num = $db->num_rows($resql); - $i = 0; + $num = $db->num_rows($resql); + $i = 0; - $paramlist=($_GET["orphelins"]?"&orphelins=1":""); - print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num); - - print '
'; - print ''; - print ''; - print_liste_field_titre($langs->trans("Ref"),"liste.php","p.rowid","",$paramlist,"",$sortfield); - print_liste_field_titre($langs->trans("Date"),"liste.php","dp","",$paramlist,'align="center"',$sortfield); - print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","",$paramlist,"",$sortfield); - print_liste_field_titre($langs->trans("Account"),"liste.php","ba.label","",$paramlist,"",$sortfield); - print_liste_field_titre($langs->trans("Amount"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield); - print_liste_field_titre($langs->trans("Status"),"liste.php","p.statut","",$paramlist,'align="center"',$sortfield); - print "\n"; - - // Lignes des champs de filtre - - print ''; - print ''; - print ''; - print "\n"; - - $var=true; - while ($i < min($num,$limit)) - { - $objp = $db->fetch_object($resql); - $var=!$var; - print ""; - print ''; - - print ''; - print ''; - print ''; - print ''; - print ''; - $i++; - } - print "
 '; - print ''; - print ''; - print ''; - print '
'.img_object($langs->trans("ShowPayment"),"payment").''; - - print ' '.$objp->rowid.''.dolibarr_print_date($objp->dp).''.$langs->trans("PaymentTypeShort".$objp->paiement_code).' '.$objp->num_paiement.''; - if ($objp->bid) print ''.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.''; - else print ' '; - print ''.price($objp->amount).''; - - if ($objp->statut == 0) - { - print ''.$langs->trans("ToValidate").''; - } - else - { - print img_tick(); - } - - print '
\n"; - print "
\n"; + $paramlist=($_GET["orphelins"]?"&orphelins=1":""); + print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num); + + print '
'; + print ''; + print ''; + print_liste_field_titre($langs->trans("Ref"),"liste.php","p.rowid","",$paramlist,"",$sortfield); + print_liste_field_titre($langs->trans("Date"),"liste.php","dp","",$paramlist,'align="center"',$sortfield); + print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","",$paramlist,"",$sortfield); + print_liste_field_titre($langs->trans("Account"),"liste.php","ba.label","",$paramlist,"",$sortfield); + print_liste_field_titre($langs->trans("Amount"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield); + print_liste_field_titre($langs->trans("Status"),"liste.php","p.statut","",$paramlist,'align="right"',$sortfield); + print ''; + print "\n"; + + // Lignes des champs de filtre + print ''; + print ''; + print ''; + print "\n"; + + $var=true; + while ($i < min($num,$limit)) + { + $objp = $db->fetch_object($resql); + $var=!$var; + print ""; + + print ''; + + print ''; + print ''; + print ''; + print ''; + print ''; + + print ''; + + print ''; + + $i++; + } + print "
 
 '; + print ''; + print ''; + print ''; + print '
'; + $paymentstatic->rowid=$objp->rowid; + print $paymentstatic->getNomUrl(1); + print ''.dolibarr_print_date($objp->dp).''.$langs->trans("PaymentTypeShort".$objp->paiement_code).' '.$objp->num_paiement.''; + if ($objp->bid) + { + $accountstatic->id=$objp->bid; + $accountstatic->label=$objp->label; + print $accountstatic->getNomUrl(1); + } + else print ' '; + print ''.price($objp->amount).''; + print $paymentstatic->LibStatut($objp->statut,5); + print ''; + if ($objp->statut == 0) + { + print ''.$langs->trans("Validate").''; + } + else print ' '; + print '
\n"; + print "
\n"; } else { diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index c7fe7acc8c7..8645b04b60c 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -377,24 +377,25 @@ class MenuLeft { $newmenu->add(DOL_URL_ROOT."/compta/facture.php?leftmenu=customers_bills",$langs->trans("BillsCustomers"),1,$user->rights->facture->lire); if ($user->societe_id == 0) { - if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/clients.php?action=facturer",$langs->trans("NewBill"),2,$user->rights->facture->creer); + if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/clients.php?action=facturer&leftmenu=customers_bills",$langs->trans("NewBill"),2,$user->rights->facture->creer); } if (! defined("FACTURE_DISABLE_RECUR") || ! FACTURE_DISABLE_RECUR) { - if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php",$langs->trans("Repeatable"),2,$user->rights->facture->lire); + if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php?leftmenu=customers_bills",$langs->trans("Repeatable"),2,$user->rights->facture->lire); } - if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/impayees.php",$langs->trans("Unpayed"),2,$user->rights->facture->lire); + if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/impayees.php?leftmenu=customers_bills",$langs->trans("Unpayed"),2,$user->rights->facture->lire); + if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/liste.php?leftmenu=customers_bills_payments",$langs->trans("Payments"),2,$user->rights->facture->lire); - if (eregi("customers_bills_payments",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/avalider.php",$langs->trans("MenuToValid"),3,$user->rights->facture->lire); - if (eregi("customers_bills_payments",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/rapport.php",$langs->trans("Reportings"),3,$user->rights->facture->lire); + if (eregi("customers_bills_payments",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/avalider.php?leftmenu=customers_bills_payments",$langs->trans("MenuToValid"),3,$user->rights->facture->lire); + if (eregi("customers_bills_payments",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/rapport.php?leftmenu=customers_bills_payments",$langs->trans("Reportings"),3,$user->rights->facture->lire); - if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/", $langs->trans("Statistics"),2,$user->rights->facture->lire); + if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=customers_bills_checks",$langs->trans("CheckReceipt"),2,$user->rights->facture->lire); + if (eregi("customers_bills_checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=customers_bills_checks&action=new",$langs->trans("NewCheckDeposit"),3,$user->rights->facture->lire); + if (eregi("customers_bills_checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=customers_bills_checks",$langs->trans("List"),3,$user->rights->facture->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php",$langs->trans("CheckReceipt"),1,$user->rights->facture->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?action=new",$langs->trans("New"),2,$user->rights->facture->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php",$langs->trans("List"),2,$user->rights->facture->lire); + if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/index.php?leftmenu=customers_bills", $langs->trans("Statistics"),2,$user->rights->facture->lire); } // Propal diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 03e81ed7f61..a6357c274f5 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -56,4 +56,10 @@ AccountNumber=Account number NewAccount=New account SalesTurnover=Sales turnover AccountancyExport=Accountancy export -ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s \ No newline at end of file +ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s +SuppliersProductsSellSalesTurnover=Chiffres d'affaire générés par la vente des produits des fournisseurs +CheckReceipt=Check receipt +NewCheckReceipt=Nouvelle remise +NewCheckDeposit=New check deposit +NewCheckDepositOn=New check deposit on account: %s +NoWaitingChecks=No checks waiting for deposit. \ No newline at end of file diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 1fd6216353f..9cef7543f89 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -59,4 +59,7 @@ AccountancyExport=Export comptable ErrorWrongAccountancyCodeForCompany=Code compta client incorrect pour %s SuppliersProductsSellSalesTurnover=Chiffres d'affaire générés par la vente des produits des fournisseurs CheckReceipt=Remise de chèques -NewCheckReceipt=Nouvelle remise \ No newline at end of file +NewCheckReceipt=Nouvelle remise +NewCheckDeposit=Nouveau dépôt +NewCheckDepositOn=Nouveau dépôt sur compte: %s +NoWaitingChecks=Pas de chèque en attente de dépots. \ No newline at end of file diff --git a/htdocs/paiement.class.php b/htdocs/paiement.class.php index 197ae4c43fa..54e80d07201 100644 --- a/htdocs/paiement.class.php +++ b/htdocs/paiement.class.php @@ -394,5 +394,79 @@ class Paiement } } + + /** + * \brief Renvoie nom clicable (avec eventuellement le picto) + * \param withpicto Inclut le picto dans le lien + * \param option Sur quoi pointe le lien + * \return string Chaine avec URL + */ + function getNomUrl($withpicto=0,$option='') + { + global $langs; // TODO Renvoyer le libellé anglais et faire traduction a affichage + + $result=''; + + $lien = ''; + $lienfin=''; + + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"),'payment').$lienfin.' '); + $result.=$lien.$this->rowid.$lienfin; + return $result; + } + + /** + * \brief Retourne le libellé du statut d'une facture (brouillon, validée, abandonnée, payée) + * \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court, 3=Picto, 4=Picto + Libellé long, 5=Libellé court + Picto + * \return string Libelle + */ + function getLibStatut($mode=0) + { + return $this->LibStatut($this->statut,$mode); + } + + /** + * \brief Renvoi le libellé d'un statut donne + * \param status Statut + * \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court, 3=Picto, 4=Picto + Libellé long, 5=Libellé court + Picto + * \return string Libellé du statut + */ + function LibStatut($status,$mode=0) + { + global $langs; // TODO Renvoyer le libellé anglais et faire traduction a affichage + $langs->load('compta'); + if ($mode == 0) + { + if ($status == 0) return $langs->trans('ToValidate'); + if ($status == 1) return $langs->trans('Validated'); + } + if ($mode == 1) + { + if ($status == 0) return $langs->trans('ToValidate'); + if ($status == 1) return $langs->trans('Validated'); + } + if ($mode == 2) + { + if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate'); + if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated'); + } + if ($mode == 3) + { + if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1'); + if ($status == 1) return img_picto($langs->trans('Validated'),'statut4'); + } + if ($mode == 4) + { + if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate'); + if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated'); + } + if ($mode == 5) + { + if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1'); + if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4'); + } + return $langs->trans('Unknown'); + } + } ?>