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

Trad: Dbut de le traduction des notions de relevs et rapprochements

Browse Source
This commit is contained in:
Laurent Destailleur 2005-01-31 14:49:39 +00:00
parent 366a16bcad
commit 5c39ead73a
5 changed files with 102 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
htdocs/compta/bank/account.php
View File

@ -23,7 +23,7 @@
* *
*/ */
/*! \file htdocs/compta/bank/account.php /** \file htdocs/compta/bank/account.php
\ingroup banque \ingroup banque
\brief Page de détail des transactions bancaires \brief Page de détail des transactions bancaires
\version $Revision$ \version $Revision$
@ -187,30 +187,10 @@ if ($account > 0)
$mesg.= '<a href="account.php?account='.$acct->id.'&amp;page='.($page-1).'">'.img_next().'</a>'; $mesg.= '<a href="account.php?account='.$acct->id.'&amp;page='.($page-1).'">'.img_next().'</a>';
} }
print_fiche_titre("Journal de trésorerie du compte : " .$acct->label,$mesg); print_fiche_titre("Journal de trésorerie du compte : " .$acct->label,$mesg);
print '<br>';
print '<form method="post" action="account.php">';
print '<input type="hidden" name="action" value="search">'; print '<br>';
print '<input type="hidden" name="account" value="' . $acct->id . '">'; print '<table class="border" width="100%">';
print '<table class="border" width="100%" cellspacing="0" cellpadding="2">';
print "<tr>";
print '<td>&nbsp;</td>';
print '<td colspan="3"><input type="text" name="req_desc" value="'.$_POST["req_desc"].'" size="40"></TD>';
print '<td align="right"><input type="text" name="req_debit" value="'.$_POST["req_debit"].'" size="6"></TD>';
print '<td align="right"><input type="text" name="req_credit" value="'.$_POST["req_credit"].'" size="6"></TD>';
print '<td align="center"><input type="submit" value="'.$langs->trans("Search").'"></td>';
print '<td align="center">';
if ($user->rights->banque->modifier)
{
print '<a href="rappro.php?account='.$acct->id.'">Rappro</a>';
}
else
{
print "&nbsp;";
}
print '</td>';
print "</tr>\n";
print "</form>\n";
/* /*
* Affiche tableau des transactions bancaires * Affiche tableau des transactions bancaires
@ -226,8 +206,30 @@ if ($account > 0)
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>Date Ope</td><td>Valeur</td><td>'.$langs->trans("Type").'</td><td>'.$langs->trans("Description").'</td>'; print '<td>Date Ope</td><td>Valeur</td><td>'.$langs->trans("Type").'</td><td>'.$langs->trans("Description").'</td>';
print '<td align="right">Débit</td><td align="right">Crédit</td><td align="right">Solde</td>'; print '<td align="right">'.$langs->trans("Debit").'</td><td align="right">'.$langs->trans("Credit").'</td><td align="right">Solde</td>';
print '<td align="center">Relevé</td></tr>'; print '<td align="center">'.$langs->trans("AccountStatement").'</td></tr>';
print '<form method="post" action="account.php">';
print '<input type="hidden" name="action" value="search">';
print '<input type="hidden" name="account" value="' . $acct->id . '">';
print '<tr class="liste_titre">';
print '<td colspan="3">&nbsp;</td>';
print '<td><input type="text" name="req_desc" value="'.$_POST["req_desc"].'" size="40"></td>';
print '<td align="right"><input type="text" class="flat" name="req_debit" value="'.$_POST["req_debit"].'" size="6"></td>';
print '<td align="right"><input type="text" class="flat" name="req_credit" value="'.$_POST["req_credit"].'" size="6"></td>';
print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
print '<td align="center">';
if ($user->rights->banque->modifier)
{
print '<a class="tabAction" href="rappro.php?account='.$acct->id.'">'.$langs->trans("Rappro").'</a>';
}
else
{
print "&nbsp;";
}
print '</td>';
print "</tr>\n";
print "</form>\n";
/* Another solution /* Another solution
* create temporary table solde type=heap select amount from llx_bank limit 100 ; * create temporary table solde type=heap select amount from llx_bank limit 100 ;
@ -266,18 +268,24 @@ if ($account > 0)
_print_lines($db, $sql, $acct); _print_lines($db, $sql, $acct);
} }
/* /*
* Formulaire de saisie d'une opération hors factures * Formulaire de saisie d'une opération hors factures
* *
*/ */
if ($user->rights->banque->modifier) if ($user->rights->banque->modifier)
{ {
print "<tr><td colspan=\"8\">&nbsp;</td></tr>\n"; print "<tr class=\"noborder\"><td colspan=\"8\">&nbsp;</td></tr>\n";
print "<tr>"; print "<tr>";
print "<td align=\"left\" colspan=\"8\"><b>Saisie d'une transaction hors facture</b></td></tr>"; print "<td align=\"left\" colspan=\"8\"><b>Saisie d'une transaction hors facture</b></td></tr>";
print '<tr>'; print '<tr>';
print '<td><input name="dateoy" type="text" size="3" value="'.strftime("%Y",time()).'" maxlength="4">'; print '<td><small>YYYY MMDD</small></td><td colspan="2">&nbsp;</td><td>'.$langs->trans("Description").'</td><td align=right>0000.00</td><td align=right>0000.00</td>';
print '<input name="dateo" type="text" size="3" maxlength="4"></td>'; print '<td colspan="2" align="center"><input type="submit" value="'.$langs->trans("Add").'"></td>';
print '</tr>';
print '<tr>';
print '<td nowrap><input name="dateoy" type="text" size="2" value="'.strftime("%Y",time()).'" maxlength="4">';
print '<input name="dateo" type="text" size="2" maxlength="4"></td>';
print '<td colspan="2"><select name="operation">'; print '<td colspan="2"><select name="operation">';
print '<option value="CB">CB'; print '<option value="CB">CB';
print '<option value="CHQ">CHQ'; print '<option value="CHQ">CHQ';
@ -294,12 +302,9 @@ if ($account > 0)
print "<td colspan=\"2\" align=\"center\">"; print "<td colspan=\"2\" align=\"center\">";
print "<select name=\"cat1\">$options</select>"; print "<select name=\"cat1\">$options</select>";
print '</td></tr>'; print '</td></tr>';
print '<tr>';
print '<td><small>YYYY MMDD</small></td><td colspan="2">&nbsp;</td><td>'.$langs->trans("Description").'</td><td align=right>0000.00</td><td align=right>0000.00</td>';
print '<td colspan="2" align="center"><input type="submit" value="'.$langs->trans("Add").'"></td>';
print '</tr>';
} }
print "</table>"; print "</table>";
if ($user->rights->banque->modifier) if ($user->rights->banque->modifier)
{ {

70
htdocs/compta/bank/rappro.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 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
@ -20,7 +20,7 @@
* $Source$ * $Source$
*/ */
/*! \file htdocs/compta/bank/rappro.php /** \file htdocs/compta/bank/rappro.php
\ingroup banque \ingroup banque
\brief Page de rapprochement bancaire \brief Page de rapprochement bancaire
\version $Revision$ \version $Revision$
@ -95,22 +95,6 @@ if ($result) {
} }
// Recupère nom du dernier relevé
$sql = "SELECT max(num_releve) FROM ".MAIN_DB_PREFIX."bank WHERE fk_account=".$_GET["account"];
if ( $db->query($sql) )
{
if ( $db->num_rows() )
{
$last_releve = $db->result(0, 0);
}
$db->free();
}
else
{
dolibarr_print_error($db);
}
/* /*
* Affichage liste des transactions à rapprocher * Affichage liste des transactions à rapprocher
*/ */
@ -134,22 +118,52 @@ if ($result)
} }
else { else {
print_titre('Rapprochement compte bancaire: <a href="account.php?account='.$_GET["account"].'">'.$acct->label.'</a>'); print_titre('Rapprochement compte bancaire : <a href="account.php?account='.$_GET["account"].'">'.$acct->label.'</a>');
print '<br>'; print '<br>';
if ($msg) { if ($msg) {
print "$msg<br><br>"; print "$msg<br><br>";
} }
// Affiche nom des derniers relevés
$nbmax=5;
$sql = "SELECT distinct num_releve FROM ".MAIN_DB_PREFIX."bank";
$sql.= " WHERE fk_account=".$_GET["account"];
$sql.= " ORDER BY num_releve DESC";
$sql.= " LIMIT ".($nbmax+1);
print $langs->trans("LastAccountStatements").' : ';
$resultr=$db->query($sql);
$liste="";
if ($resultr)
{
$num=$db->num_rows();
$i=0;
while (($i < $num) && ($i < $nbmax))
{
$objr = $db->fetch_object($resultr);
$last_releve = $objr->num_releve;
$i++;
$liste='<a href="releve.php?account='.$_GET["account"].'&amp;num='.$objr->num_releve.'">'.$objr->num_releve.'</a> &nbsp; '.$liste;
}
if ($num >= $nbmax) $liste="... &nbsp; ".$liste;
print "$liste";
if ($num > 0) print '<br><br>';
else print $langs->trans("None").'<br><br>';
}
else
{
dolibarr_print_error($db);
}
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print '<td>Date Ope</td>'; print '<td>'.$langs->trans("Date").'</td>';
print '<td>Date Valeur</td>'; print '<td>'.$langs->trans("DateValue").'</td>';
print '<td>'.$langs->trans("Type").'</td>'; print '<td>'.$langs->trans("Type").'</td>';
print '<td>'.$langs->trans("Description").'</td>'; print '<td>'.$langs->trans("Description").'</td>';
print '<td align="right">Debit</td>'; print '<td align="right">'.$langs->trans("Debit").'</td>';
print '<td align="right">Credit</td>'; print '<td align="right">'.$langs->trans("Credit").'</td>';
print '<td align="center" width="100">Releve<br>(Ex: YYYYMM)</td>'; print '<td align="center" width="100">'.$langs->trans("AccountStatement").'<br>(Ex: YYYYMM)</td>';
print '<td align="center" width="100" colspan="2">'.$langs->trans("Action").'</td>'; print '<td align="center" width="100" colspan="2">'.$langs->trans("Action").'</td>';
print "</tr>\n"; print "</tr>\n";
} }
@ -157,7 +171,7 @@ if ($result)
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object(); $objp = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
@ -182,13 +196,13 @@ if ($result)
if ($objp->do <= mktime() ) { if ($objp->do <= mktime() ) {
print "<td align=\"center\">"; print "<td align=\"center\">";
print "<input name=\"num_releve\" type=\"text\" value=\"\" size=\"8\">"; print "<input class=\"flat\" name=\"num_releve\" type=\"text\" value=\"\" size=\"8\">";
if ($options) { if ($options) {
print "<br><select name=\"cat1\">$options"; print "<br><select name=\"cat1\">$options";
print "</select>"; print "</select>";
} }
print "</td>"; print "</td>";
print "<td align=\"center\"><input type=\"submit\" value=\"".$langs->trans("Rapprocher")."\">"; print "<td align=\"center\"><input class=\"button\" type=\"submit\" value=\"".$langs->trans("Rapprocher")."\">";
print "</td>"; print "</td>";
} }
else { else {
@ -237,8 +251,6 @@ if ($result)
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print '<br>Dernier relevé : <a href="releve.php?account='.$_GET["account"].'&amp;num='.$last_releve.'">'.$last_releve.'</a>';
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");

22
htdocs/compta/bank/releve.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 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
@ -20,7 +20,7 @@
* $Source$ * $Source$
*/ */
/*! /**
\file htdocs/compta/bank/releve.php \file htdocs/compta/bank/releve.php
\ingroup banque \ingroup banque
\brief Page d'affichage d'un relevé \brief Page d'affichage d'un relevé
@ -86,7 +86,7 @@ if (! isset($_GET["num"]))
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print "<td>Relevé</td></tr>"; print '<td>'.$langs->trans("AccountStatement").'</td></tr>';
while ($i < min($numrows,$limit)) while ($i < min($numrows,$limit))
{ {
@ -153,17 +153,17 @@ else
} }
$ve=$_GET["ve"]; $ve=$_GET["ve"];
$mesprevnext ="<a href=\"releve.php?rel=prev&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">".img_previous()."</a>"; $mesprevnext ="<a href=\"releve.php?rel=prev&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">".img_previous()."</a> &nbsp;";
$mesprevnext.=" Relevé $num "; $mesprevnext.= $langs->trans("AccountStatement")." $num";
$mesprevnext.="<a href=\"releve.php?rel=next&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">".img_next()."</a>"; $mesprevnext.=" &nbsp; <a href=\"releve.php?rel=next&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">".img_next()."</a>";
print_fiche_titre('Relevé numéro '.$num.', compte : <a href="account.php?account='.$acct->id.'">'.$acct->label.'</a>',$mesprevnext); print_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : <a href="account.php?account='.$acct->id.'">'.$acct->label.'</a>',$mesprevnext);
print '<br>';
print "<form method=\"post\" action=\"releve.php\">"; print "<form method=\"post\" action=\"releve.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"add\">"; print "<input type=\"hidden\" name=\"action\" value=\"add\">";
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print '<td>Date Ope</td><td>Date Valeur</td><td>'.$langs->trans("Type").'</td><td width="30%">'.$langs->trans("Description").'</td>'; print '<td>'.$langs->trans("Date").'</td><td>'.$langs->trans("DateValue").'</td><td>'.$langs->trans("Type").'</td><td width="30%">'.$langs->trans("Description").'</td>';
print '<td align="right">'.$langs->trans("Debit").'</td>'; print '<td align="right">'.$langs->trans("Debit").'</td>';
print '<td align="right">'.$langs->trans("Credit").'</td>'; print '<td align="right">'.$langs->trans("Credit").'</td>';
print '<td align="right">'.$langs->trans("Solde").'</td>'; print '<td align="right">'.$langs->trans("Solde").'</td>';
@ -180,8 +180,8 @@ else
$sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do,".$db->pdate("b.datev")." as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type"; $sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do,".$db->pdate("b.datev")." as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type";
$sql .= " FROM ".MAIN_DB_PREFIX."bank as b WHERE"; $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql .= " num_releve='".$num."'"; $sql .= " WHERE num_releve='".$num."'";
if (! $num) { if (! $num) {
$sql .= " or num_releve is null"; $sql .= " or num_releve is null";
} }

5
htdocs/langs/en_US/banks.lang
View File

@ -11,3 +11,8 @@ StandingOrders=Standing Orders
StandingOrder=Standing Order StandingOrder=Standing Order
Withdrawals=Withdrawals Withdrawals=Withdrawals
Withdrawal=Withdrawal Withdrawal=Withdrawal
AccountStatement=Account statement
AccountStatements=Account statements
LastAccountStatements=Last account statements
Rappro=Rappro
Rapprochement=Rapprochement

5
htdocs/langs/fr_FR/banks.lang
View File

@ -11,3 +11,8 @@ StandingOrders=Pr
StandingOrder=Prélèvement StandingOrder=Prélèvement
Withdrawals=Retraits Withdrawals=Retraits
Withdrawal=Retrait Withdrawal=Retrait
AccountStatement=Relevé
AccountStatements=Relevés
LastAccountStatements=Derniers relevés bancaires
Rappro=Rappro
Rapprochement=Rapprochement