lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: Uniformisation du code. Ajout des methodes getNomUrl et GetLibStatut sur entits paiement et remisecheque

Browse Source
This commit is contained in:
Laurent Destailleur 2007-01-05 20:30:34 +00:00
parent 6e6434ea8f
commit d5f06aa448
10 changed files with 482 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

256
htdocs/compta/paiement/cheque/fiche.php
View File

@ -28,6 +28,8 @@
require('./pre.inc.php'); require('./pre.inc.php');
require_once(DOL_DOCUMENT_ROOT.'/paiement.class.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'); $user->getrights('banque');
@ -131,7 +133,7 @@ if ($_GET['action'] == 'new')
{ {
$h=0; $h=0;
$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/cheque/fiche.php?action=new'; $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; $hselected = $h;
$h++; $h++;
@ -182,147 +184,165 @@ if ($mesg) print $mesg.'<br>';
*/ */
if ($_GET['action'] == 'new') if ($_GET['action'] == 'new')
{ {
$accounts = array(); $accounts = array();
$lines = array(); $lines = array();
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dolibarr_print_date(time()).'</td></tr>'; print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dolibarr_print_date(time()).'</td></tr>';
print '</table><br />'; print '</table><br />';
$sql = "SELECT ba.rowid as bid, ".$db->pdate("b.dateo")." as date,"; $sql = "SELECT ba.rowid as bid, ".$db->pdate("b.dateo")." as date,";
$sql.= " b.amount, ba.label, b.emetteur, b.banque"; $sql.= " b.amount, ba.label, b.emetteur, b.banque";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b "; $sql.= " FROM ".MAIN_DB_PREFIX."bank as b ";
$sql.= ",".MAIN_DB_PREFIX."bank_account as ba "; $sql.= ",".MAIN_DB_PREFIX."bank_account as ba ";
$sql.= " WHERE b.fk_type = 'CHQ' AND b.fk_account = ba.rowid"; $sql.= " WHERE b.fk_type = 'CHQ' AND b.fk_account = ba.rowid";
$sql.= " AND b.fk_bordereau = 0 AND b.amount > 0"; $sql.= " AND b.fk_bordereau = 0 AND b.amount > 0";
$sql.= " ORDER BY b.emetteur ASC, b.rowid ASC;"; $sql.= " ORDER BY b.emetteur ASC, b.rowid ASC;";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{
$i = 0;
while ( $obj = $db->fetch_object($resql) )
{ {
$accounts[$obj->bid] = $obj->label; $i = 0;
$lines[$obj->bid][$i]["date"] = $obj->date; while ( $obj = $db->fetch_object($resql) )
$lines[$obj->bid][$i]["amount"] = $obj->amount; {
$lines[$obj->bid][$i]["emetteur"] = $obj->emetteur; $accounts[$obj->bid] = $obj->label;
$lines[$obj->bid][$i]["banque"] = $obj->banque; $lines[$obj->bid][$i]["date"] = $obj->date;
$i++; $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").'<br>';
}
} }
}
foreach ($accounts as $bid => $account_label) foreach ($accounts as $bid => $account_label)
{
$num = $db->num_rows($resql);
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Date")."</td>\n";
print '<td>'.$langs->trans("CheckTransmitter")."</td>\n";
print '<td>'.$langs->trans("Bank")."</td>\n";
print '<td align="right">'.$langs->trans("Amount")."</td>\n";
print "</tr>\n";
$var=true;
foreach ($lines[$bid] as $lid => $value)
{ {
$var=!$var; $num = $db->num_rows($resql);
$account_id = $objp->bid; print '<table class="noborder" width="100%">';
$accounts[$objp->bid] += 1; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Date")."</td>\n";
print '<td>'.$langs->trans("CheckTransmitter")."</td>\n";
print '<td>'.$langs->trans("Bank")."</td>\n";
print '<td align="right">'.$langs->trans("Amount")."</td>\n";
print "</tr>\n";
print "<tr $bc[$var]>"; $var=true;
print '<td width="120">'.dolibarr_print_date($value["date"]).'</td>';
print '<td>'.stripslashes($value["emetteur"])."</td>\n"; foreach ($lines[$bid] as $lid => $value)
print '<td>'.stripslashes($value["banque"])."</td>\n"; {
print '<td align="right">'.price($value["amount"]).'</td>'; $var=!$var;
print '</tr>';
$i++; $account_id = $objp->bid;
$accounts[$objp->bid] += 1;
print "<tr $bc[$var]>";
print '<td width="120">'.dolibarr_print_date($value["date"]).'</td>';
print '<td>'.$value["emetteur"]."</td>\n";
print '<td>'.$value["banque"]."</td>\n";
print '<td align="right">'.price($value["amount"]).'</td>';
print '</tr>';
$i++;
}
print "</table>";
print '<div class="tabsAction">';
print '<a class="tabAction" href="fiche.php?action=create&amp;accountid='.$bid.'">';
print $langs->trans('NewCheckDepositOn',$account_label);
print '</a>';
print '</div><br />';
} }
print "</table>";
print '<div class="tabsAction">';
print '<a class="tabAction" href="fiche.php?action=create&amp;accountid='.$bid.'">';
print $langs->trans('NewCheckReceipt');
print ' : '.stripslashes($account_label).'</a>';
print '</div><br />';
}
} }
else else
{ {
$remise->load_previous_next_id(); $accountstatic=new Account($db);
$previous_id = $remise->previous_id ? '<a href="'.$_SERVER["PHP_SELF"].'?id='.$remise->previous_id.'">'.img_previous().'</a>':'';
$next_id = $remise->next_id ? '<a href="'.$_SERVER["PHP_SELF"].'?id='.$remise->next_id.'">'.img_next().'</a>':'';
print '<table class="border" width="100%">'; $accountstatic->id=$remise->account_id;
print '<tr><td width="30%">'.$langs->trans('Numero').'</td><td width="50%">'.$remise->number.'</td><td width="20%" align="right">'; $accountstatic->label=$remise->account_label;
print $previous_id.' '.$next_id;
print "</td></tr>\n";
print '<tr><td width="30%">'.$langs->trans('Date').'</td><td colspan="2" width="70%">'.dolibarr_print_date($remise->date_bordereau).'</td></tr>'; $remise->load_previous_next_id();
print '<tr><td width="30%">'.$langs->trans('Account').'</td><td colspan="2" width="70%">'; $previous_id = $remise->previous_id ? '<a href="'.$_SERVER["PHP_SELF"].'?id='.$remise->previous_id.'">'.img_previous().'</a>':'';
print '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$remise->account_id.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$remise->account_label.'</a>'; $next_id = $remise->next_id ? '<a href="'.$_SERVER["PHP_SELF"].'?id='.$remise->next_id.'">'.img_next().'</a>':'';
print '</td></tr>';
print '<tr><td width="30%">'.$langs->trans('Total').'</td><td colspan="2" width="70%">'; print '<table class="border" width="100%">';
print price($remise->amount); print '<tr><td width="30%">'.$langs->trans('Numero').'</td><td width="50%">'.$remise->number.'</td><td width="20%" align="right">';
print '</td></tr>'; print $previous_id.' '.$next_id;
print "</td></tr>\n";
print '</table><br />'; print '<tr><td width="30%">'.$langs->trans('Date').'</td><td colspan="2" width="70%">'.dolibarr_print_date($remise->date_bordereau).'</td></tr>';
$sql = "SELECT b.amount,b.emetteur,".$db->pdate("b.dateo")." as date,b.rowid,b.banque,"; print '<tr><td width="30%">'.$langs->trans('Account').'</td><td colspan="2" width="70%">';
$sql.= " ba.rowid as bid, ba.label"; print $accountstatic->getNomUrl(1);
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; print '</td></tr>';
$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); print '<tr><td width="30%">'.$langs->trans('Total').'</td><td colspan="2" width="70%">';
print price($remise->amount);
print '</td></tr>';
if ($resql) print '</table><br />';
{
$num = $db->num_rows($resql); $sql = "SELECT b.amount,b.emetteur,".$db->pdate("b.dateo")." as date,b.rowid,b.banque,";
print '<table class="noborder" width="100%">'; $sql.= " ba.rowid as bid, ba.label";
print '<tr class="liste_titre"><td>#</td>'; $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
print '<td>'.$langs->trans("CheckTransmitter").'</td>'; $sql.= ",".MAIN_DB_PREFIX."bank_account as ba";
print '<td>'.$langs->trans("Bank").'</td>'; $sql.= " WHERE b.fk_type= 'CHQ' AND b.fk_account = ba.rowid";
print '<td align="right">'.$langs->trans("Amount").'</td>'; $sql.= " AND b.fk_bordereau = ".$remise->id;
print "<td>&nbsp;</td></tr>\n"; $sql.= " ORDER BY b.emetteur ASC, b.rowid ASC";
$i=1;
$var=false; $resql = $db->query($sql);
while ( $objp = $db->fetch_object($resql) )
if ($resql)
{ {
$account_id = $objp->bid; $num = $db->num_rows($resql);
$accounts[$objp->bid] += 1;
print "<tr $bc[$var]><td>$i</td>"; print '<table class="noborder" width="100%">';
print '<td>'.stripslashes($objp->emetteur).'</td>'; print '<tr class="liste_titre"><td>#</td>';
print '<td>'.stripslashes($objp->banque).'</td>'; print '<td>'.$langs->trans("CheckTransmitter").'</td>';
print '<td align="right">'.price($objp->amount).'</td>'; print '<td>'.$langs->trans("Bank").'</td>';
if($remise->statut == 0) print '<td align="right">'.$langs->trans("Amount").'</td>';
{ print "<td>&nbsp;</td></tr>\n";
print '<td align="right"><a href="fiche.php?id='.$remise->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a></td>'; $i=1;
} $var=false;
else while ( $objp = $db->fetch_object($resql) )
{ {
print '<td>&nbsp;</td>'; $account_id = $objp->bid;
} $accounts[$objp->bid] += 1;
print '</tr>';
$var=!$var; print "<tr $bc[$var]><td>$i</td>";
$i++; print '<td>'.$objp->emetteur.'</td>';
print '<td>'.$objp->banque.'</td>';
print '<td align="right">'.price($objp->amount).'</td>';
if($remise->statut == 0)
{
print '<td align="right"><a href="fiche.php?id='.$remise->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a></td>';
}
else
{
print '<td>&nbsp;</td>';
}
print '</tr>';
$var=!$var;
$i++;
}
print "</table>";
}
else
{
dolibarr_print_error($db);
} }
print "</table><br />";
}
else
{
dolibarr_print_error($db);
}
}
print '</div>';
if ($_GET['action'] != 'new')
{
if ($remise->statut == 1) if ($remise->statut == 1)
{ {
//show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$modelliste=array(),$forcenomultilang=0); //show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$modelliste=array(),$forcenomultilang=0);
@ -332,9 +352,6 @@ else
} }
} }
print '</div>';
/* /*
* Boutons Actions * Boutons Actions
*/ */
@ -358,6 +375,7 @@ if ($user->societe_id == 0 && $remise->statut == 0 && $_GET['action'] == '')
} }
print '</div>'; print '</div>';
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date$ - $Revision$');

79
htdocs/compta/paiement/cheque/index.php
View File

@ -27,6 +27,8 @@
*/ */
require("./pre.inc.php"); 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"); $langs->load("banks");
@ -43,15 +45,21 @@ if ($user->societe_id > 0)
$socid = $user->societe_id; $socid = $user->societe_id;
} }
$checkdepositstatic=new RemiseCheque($db);
$accountstatic=new Account($db);
/* /*
* Affichage * Affichage
*/ */
llxHeader('',$langs->trans("CheckReceipt")); llxHeader('',$langs->trans("CheckReceipt"));
print_titre($langs->trans("CheckReceipt") ); print_fiche_titre($langs->trans("CheckReceipt") );
print '<table width="100%"><tr><td width="30%" valign="top">'; print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
$sql = "SELECT count(b.rowid)"; $sql = "SELECT count(b.rowid)";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
@ -67,12 +75,12 @@ print "</tr>\n";
if ($resql) if ($resql)
{ {
$var=true; $var=false;
if ($row = $db->fetch_row($resql) ) if ($row = $db->fetch_row($resql) )
{ {
$num = $row[0]; $num = $row[0];
} }
print "<tr $bc[$var]>"; print "<tr ".$bc[$var].">";
print '<td>'.$langs->trans("BankChecksToReceipt").'</td>'; print '<td>'.$langs->trans("BankChecksToReceipt").'</td>';
print '<td align="right">'.$num.'</td></tr>'; print '<td align="right">'.$num.'</td></tr>';
print "</table>\n"; print "</table>\n";
@ -82,8 +90,9 @@ else
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print "</td>\n";
print '<td width="70%" valign="top">'; print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
$sql = "SELECT bc.rowid,".$db->pdate("bc.date_bordereau")." as db, bc.amount,bc.number,"; $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.= " bc.statut, ba.label, ba.rowid as bid";
@ -96,35 +105,41 @@ $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Date")."</td>"; print '<tr class="liste_titre"><td>'.$langs->trans("Date")."</td>";
print '<td>'.$langs->trans("Numero").'</td>'; print '<td>'.$langs->trans("Numero").'</td>';
print '<td>'.$langs->trans("Account").'</td>'; print '<td>'.$langs->trans("Account").'</td>';
print '<td align="right">'.$langs->trans("Amount").'</td>'; print '<td align="right">'.$langs->trans("Amount").'</td>';
print "</tr>\n"; print '<td align="right">'.$langs->trans("Status").'</td>';
print "</tr>\n";
$var=true; $var=true;
while ( $objp = $db->fetch_object($resql) ) while ( $objp = $db->fetch_object($resql) )
{
$var=!$var;
print "<tr $bc[$var]>\n";
print '<td>';
print '<img src="statut'.$objp->statut.'.png" alt="Statut" width="12" height="12"> ';
print dolibarr_print_date($objp->db,'%d/%m').'</td>';
if ($objp->statut == 1)
{ {
print '<td><a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/fiche.php?id='.$objp->rowid.'">'.$objp->number.'</a></td>'; $checkdepositstatic->statut=$objp->statut;
$checkdepositstatic->rowid=$objp->rowid;
$checkdepositstatic->number=$objp->number;
$accountstatic->id=$objp->bid;
$accountstatic->label=$objp->label;
$var=!$var;
print "<tr $bc[$var]>\n";
print '<td>'.dolibarr_print_date($objp->db,'day').'</td>';
print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>';
print '<td>'.$accountstatic->getNomUrl(1).'</td>';
print '<td align="right">'.price($objp->amount).'</td>';
print '<td align="right">'.$checkdepositstatic->LibStatut($objp->statut,3).'</td>';
print '</tr>';
} }
else print "</table>";
{ $db->free($resql);
print '<td><a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/fiche.php?id='.$objp->rowid.'">(PROV'.$objp->rowid.')</a></td>';
}
print '<td><a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'</a>';
print '</td>';
print '<td align="right">'.price($objp->amount).'</td></tr>';
}
print "</table>";
$db->free($resql);
} }
else else
{ {

48
htdocs/compta/paiement/cheque/liste.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2007 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -27,6 +28,8 @@
*/ */
require("./pre.inc.php"); 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"); $langs->load("bills");
@ -43,13 +46,6 @@ if ($user->societe_id > 0)
$socid = $user->societe_id; $socid = $user->societe_id;
} }
/*
* Affichage
*/
llxHeader('',$langs->trans("CheckReceipt"));
$page=$_GET["page"]; $page=$_GET["page"];
$sortorder=$_GET["sortorder"]; $sortorder=$_GET["sortorder"];
$sortfield=$_GET["sortfield"]; $sortfield=$_GET["sortfield"];
@ -59,17 +55,25 @@ $offset = $limit * $page ;
if (! $sortorder) $sortorder="DESC"; if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="bc.rowid"; 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 = "SELECT bc.rowid, bc.number, ".$db->pdate("bc.date_bordereau") ." as dp, bc.amount, bc.statut,";
$sql.= " ba.rowid as bid, ba.label"; $sql.= " ba.rowid as bid, ba.label";
$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc"; $sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc";
$sql.= ",".MAIN_DB_PREFIX."bank_account as ba"; $sql.= ",".MAIN_DB_PREFIX."bank_account as ba";
$sql.= " WHERE bc.fk_bank_account = ba.rowid"; $sql.= " WHERE bc.fk_bank_account = ba.rowid";
if ($_GET["search_montant"]) if ($_GET["search_montant"])
{ {
$sql .=" AND p.amount=".price2num($_GET["search_montant"]); $sql .=" AND p.amount=".price2num($_GET["search_montant"]);
} }
$sql .= " ORDER BY $sortfield $sortorder"; $sql .= " ORDER BY $sortfield $sortorder";
$sql .= $db->plimit( $limit+1 ,$offset); $sql .= $db->plimit( $limit+1 ,$offset);
//print "$sql"; //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("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("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("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 "</tr>\n"; print "</tr>\n";
// Lignes des champs de filtre // Lignes des champs de filtre
@ -109,26 +113,34 @@ if ($resql)
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
// Num ref cheque
print '<td width="80">'; print '<td width="80">';
print '<img src="statut'.$objp->statut.'.png" alt="Statut" width="12" height="12"> '; $checkdepositstatic->rowid=$objp->rowid;
print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/fiche.php?id='.$objp->rowid.'">'.$objp->number.'</a></td>'; $checkdepositstatic->statut=$objp->statut;
$checkdepositstatic->number=$objp->number;
print $checkdepositstatic->getNomUrl(1);
print '</td>';
// Date
print '<td align="center">'.dolibarr_print_date($objp->dp).'</td>'; print '<td align="center">'.dolibarr_print_date($objp->dp).'</td>';
// Banque
print '<td>'; print '<td>';
if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'</a>'; if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'</a>';
else print '&nbsp;'; else print '&nbsp;';
print '</td>'; print '</td>';
print '<td align="right">'.price($objp->amount).'</td>';
print '<td align="center">';
// Montant
print '<td align="right">'.price($objp->amount).'</td>';
// Statut
print '<td align="right">';
if ($objp->statut == 0) if ($objp->statut == 0)
{ {
print '<a href="fiche.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("ToValidate").'</a>'; print '<a href="fiche.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("ToValidate").'</a>';
} }
else print $checkdepositstatic->LibStatut($objp->statut,5);
{
print img_tick();
}
print "</td></tr>\n"; print "</td></tr>\n";
$i++; $i++;
} }

2
htdocs/compta/paiement/cheque/pre.inc.php
View File

@ -38,7 +38,7 @@ function llxHeader($head = "", $title="")
$menu->add("/compta/paiement/liste.php",$langs->trans("Payments")); $menu->add("/compta/paiement/liste.php",$langs->trans("Payments"));
$menu->add(DOL_URL_ROOT."/compta/paiement/cheque/index.php",$langs->trans("CheckReceipt")); $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_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php",$langs->trans("List"));
$menu->add(DOL_URL_ROOT."/compta/paiement/rapport.php",$langs->trans("Reportings")); $menu->add(DOL_URL_ROOT."/compta/paiement/rapport.php",$langs->trans("Reportings"));

98
htdocs/compta/paiement/cheque/remisecheque.class.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2007 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -17,25 +18,24 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
\file htdocs/compta/paiement/cheque/resimecheque.class.php \file htdocs/compta/paiement/cheque/resimecheque.class.php
\ingroup compta \ingroup compta
\brief Fichier de la classe des bordereau de remise de cheque \brief Fichier de la classe des bordereau de remise de cheque
\version $Revision$ \version $Revision$
*/ */
/** /**
\class RemiseCheque \class RemiseCheque
\brief Classe permettant la gestion des remises de cheque \brief Classe permettant la gestion des remises de cheque
*/ */
class RemiseCheque class RemiseCheque
{ {
var $db ; var $db;
var $id ; var $id;
var $num; var $num;
var $intitule; var $intitule;
//! Numero d'erreur Plage 1024-1279 //! Numero d'erreur Plage 1024-1279
@ -47,9 +47,10 @@ class RemiseCheque
* \param id id compte (0 par defaut) * \param id id compte (0 par defaut)
*/ */
function RemiseCheque($DB) function RemiseCheque($DB,$langs='')
{ {
$this->db = $DB; $this->db = $DB;
$this->langs = $langs;
$this->next_id = 0; $this->next_id = 0;
$this->previous_id = 0; $this->previous_id = 0;
} }
@ -498,5 +499,82 @@ class RemiseCheque
return $this->errno; 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 = '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/fiche.php?id='.$this->rowid.'">';
$lienfin='</a>';
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');
}
} }
?> ?>

121
htdocs/compta/paiement/liste.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -28,6 +28,8 @@
*/ */
require("./pre.inc.php"); 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"); $langs->load("bills");
@ -44,6 +46,10 @@ if ($user->societe_id > 0)
$socid = $user->societe_id; $socid = $user->societe_id;
} }
$paymentstatic=new Paiement($db);
$accountstatic=new Account($db);
/* /*
* Affichage * Affichage
*/ */
@ -103,67 +109,76 @@ $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
$paramlist=($_GET["orphelins"]?"&orphelins=1":""); $paramlist=($_GET["orphelins"]?"&orphelins=1":"");
print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num); print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num);
print '<form method="get" action="liste.php">'; print '<form method="get" action="liste.php">';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),"liste.php","p.rowid","",$paramlist,"",$sortfield); 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("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("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("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("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 "</tr>\n"; print '<td>&nbsp;</td>';
print "</tr>\n";
// Lignes des champs de filtre // Lignes des champs de filtre
print '<tr class="liste_titre">';
print '<td colspan="4">&nbsp;</td>';
print '<td align="right">';
print '<input class="fat" type="text" size="6" name="search_montant" value="'.$_GET["search_montant"].'">';
print '</td><td align="right" colspan="2">';
print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">';
print '</td>';
print "</tr>\n";
print '<tr class="liste_titre">'; $var=true;
print '<td colspan="4">&nbsp;</td>'; while ($i < min($num,$limit))
print '<td align="right">'; {
print '<input class="fat" type="text" size="6" name="search_montant" value="'.$_GET["search_montant"].'">'; $objp = $db->fetch_object($resql);
print '</td><td align="right">'; $var=!$var;
print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">'; print "<tr $bc[$var]>";
print '</td>';
print "</tr>\n";
$var=true; print '<td width="40">';
while ($i < min($num,$limit)) $paymentstatic->rowid=$objp->rowid;
{ print $paymentstatic->getNomUrl(1);
$objp = $db->fetch_object($resql); print '</td>';
$var=!$var;
print "<tr $bc[$var]>";
print '<td width="40"><a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").'</a>';
print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.$objp->rowid.'</a></td>'; print '<td align="center">'.dolibarr_print_date($objp->dp).'</td>';
print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).' '.$objp->num_paiement.'</td>';
print '<td>';
if ($objp->bid)
{
$accountstatic->id=$objp->bid;
$accountstatic->label=$objp->label;
print $accountstatic->getNomUrl(1);
}
else print '&nbsp;';
print '</td>';
print '<td align="right">'.price($objp->amount).'</td>';
print '<td align="right">';
print $paymentstatic->LibStatut($objp->statut,5);
print '</td>';
print '<td align="center">'.dolibarr_print_date($objp->dp).'</td>'; print '<td align="right">';
print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).' '.$objp->num_paiement.'</td>'; if ($objp->statut == 0)
print '<td>'; {
if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'</a>'; print '<a href="fiche.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("Validate").'</a>';
else print '&nbsp;'; }
print '</td>'; else print '&nbsp;';
print '<td align="right">'.price($objp->amount).'</td>'; print '</td>';
print '<td align="center">';
if ($objp->statut == 0) print '</tr>';
{
print '<a href="fiche.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("ToValidate").'</a>';
}
else
{
print img_tick();
}
print '</td></tr>'; $i++;
$i++; }
} print "</table>\n";
print "</table>\n"; print "</form>\n";
print "</form>\n";
} }
else else
{ {

19
htdocs/includes/menus/barre_left/eldy_backoffice.php
View File

@ -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); $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 ($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&amp;leftmenu=customers_bills",$langs->trans("NewBill"),2,$user->rights->facture->creer);
} }
if (! defined("FACTURE_DISABLE_RECUR") || ! FACTURE_DISABLE_RECUR) 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",$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/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",$langs->trans("Reportings"),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&amp;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); 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);
$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);
} }
// Propal // Propal

6
htdocs/langs/en_US/compta.lang
View File

@ -57,3 +57,9 @@ NewAccount=New account
SalesTurnover=Sales turnover SalesTurnover=Sales turnover
AccountancyExport=Accountancy export AccountancyExport=Accountancy export
ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s 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.

3
htdocs/langs/fr_FR/compta.lang
View File

@ -60,3 +60,6 @@ ErrorWrongAccountancyCodeForCompany=Code compta client incorrect pour %s
SuppliersProductsSellSalesTurnover=Chiffres d'affaire générés par la vente des produits des fournisseurs SuppliersProductsSellSalesTurnover=Chiffres d'affaire générés par la vente des produits des fournisseurs
CheckReceipt=Remise de chèques CheckReceipt=Remise de chèques
NewCheckReceipt=Nouvelle remise 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.

74
htdocs/paiement.class.php
View File

@ -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 = '<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$this->rowid.'">';
$lienfin='</a>';
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');
}
} }
?> ?>