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

Trad: Traduction des fonctions remises de chques

Browse Source 
Ajout enre dans menu eldy pour menu gestion des adhrents
This commit is contained in:
Laurent Destailleur 2007-02-04 15:16:03 +00:00
parent 3a694a2a8d
commit bd4a190fc7
11 changed files with 80 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/card_subscriptions.php
View File

@ -393,7 +393,7 @@ if ($action == 'addsubscription' && $user->rights->adherent->cotisation->creer)
print '<tr><td colspan="2" align="center">';
print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">';
print ' &nbsp; &nbsp; ';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</td></tr>';

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

@ -1,5 +1,6 @@
<?php
/* 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
* it under the terms of the GNU General Public License as published by
@ -137,7 +138,7 @@ if ($_GET['action'] == 'new')
$hselected = $h;
$h++;
dolibarr_fiche_head($head, $hselected, $langs->trans("CheckReceipt"));
dolibarr_fiche_head($head, $hselected, $langs->trans("Cheques"));
}
else
{
@ -153,7 +154,7 @@ else
// $head[$h][1] = $langs->trans("Info");
// $h++;
dolibarr_fiche_head($head, $hselected, $langs->trans("CheckReceipt"));
dolibarr_fiche_head($head, $hselected, $langs->trans("Cheques"));
/*
* Confirmation de la suppression du bordereau
@ -271,17 +272,22 @@ else
$next_id = $remise->next_id ? '<a href="'.$_SERVER["PHP_SELF"].'?id='.$remise->next_id.'">'.img_next().'</a>':'';
print '<table class="border" width="100%">';
print '<tr><td width="30%">'.$langs->trans('Numero').'</td><td width="50%">'.$remise->number.'</td><td width="20%" align="right">';
print $previous_id.' '.$next_id;
print "</td></tr>\n";
print '<tr><td width="20%">'.$langs->trans('Numero').'</td><td colspan="2" >';
if ($previous_id || $next_id) print '<table class="nobordernopadding" width="100%"><tr class="nobordernopadding"><td class="nobordernopadding">';
// print '<td width="20%" align="right">';
print $remise->number;
//print $previous_id.' '.$next_id;
if ($previous_id || $next_id) print '</td><td class="nobordernopadding" align="center" width="20">'.$previous_id.'</td><td class="nobordernopadding" align="center" width="20">'.$next_id.'</td></tr></table>';
print "</td>";
print "</tr>\n";
print '<tr><td width="30%">'.$langs->trans('Date').'</td><td colspan="2" width="70%">'.dolibarr_print_date($remise->date_bordereau).'</td></tr>';
print '<tr><td>'.$langs->trans('Date').'</td><td colspan="2">'.dolibarr_print_date($remise->date_bordereau).'</td></tr>';
print '<tr><td width="30%">'.$langs->trans('Account').'</td><td colspan="2" width="70%">';
print '<tr><td>'.$langs->trans('Account').'</td><td colspan="2">';
print $accountstatic->getNomUrl(1);
print '</td></tr>';
print '<tr><td width="30%">'.$langs->trans('Total').'</td><td colspan="2" width="70%">';
print '<tr><td>'.$langs->trans('Total').'</td><td colspan="2">';
print price($remise->amount);
print '</td></tr>';

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

@ -1,5 +1,6 @@
<?php
/* 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
* it under the terms of the GNU General Public License as published by
@ -53,9 +54,9 @@ $accountstatic=new Account($db);
* Affichage
*/
llxHeader('',$langs->trans("CheckReceipt"));
llxHeader('',$langs->trans("ChequesArea"));
print_fiche_titre($langs->trans("CheckReceipt") );
print_fiche_titre($langs->trans("ChequesArea") );
print '<table border="0" width="100%" class="notopnoleftnoright">';
@ -82,7 +83,9 @@ if ($resql)
}
print "<tr ".$bc[$var].">";
print '<td>'.$langs->trans("BankChecksToReceipt").'</td>';
print '<td align="right">'.$num.'</td></tr>';
print '<td align="right">';
print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/fiche.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
print '</td></tr>';
print "</table>\n";
}
else
@ -106,8 +109,9 @@ $resql = $db->query($sql);
if ($resql)
{
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Date")."</td>";
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Numero").'</td>';
print '<td>'.$langs->trans("Date")."</td>";
print '<td>'.$langs->trans("Account").'</td>';
print '<td align="right">'.$langs->trans("Amount").'</td>';
print '<td align="right">'.$langs->trans("Status").'</td>';
@ -126,14 +130,10 @@ if ($resql)
$var=!$var;
print "<tr $bc[$var]>\n";
print '<td>'.dolibarr_print_date($objp->db,'day').'</td>';
print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>';
print '<td>'.dolibarr_print_date($objp->db,'day').'</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>';

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

@ -63,7 +63,7 @@ $accountstatic=new Account($db);
* Affichage
*/
llxHeader('',$langs->trans("CheckReceipt"));
llxHeader('',$langs->trans("ChequesReceipts"));
$sql = "SELECT bc.rowid, bc.number, ".$db->pdate("bc.date_bordereau") ." as dp, bc.amount, bc.statut,";
$sql.= " ba.rowid as bid, ba.label";
@ -85,7 +85,7 @@ if ($resql)
$num = $db->num_rows($resql);
$i = 0;
print_barre_liste($langs->trans("CheckReceipt"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num);
print_barre_liste($langs->trans("ChequesReceipts"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num);
print '<form method="get" action="liste.php">';
print '<table class="noborder" width="100%">';
@ -136,10 +136,6 @@ if ($resql)
// Statut
print '<td align="right">';
if ($objp->statut == 0)
{
print '<a href="fiche.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("ToValidate").'</a>';
}
print $checkdepositstatic->LibStatut($objp->statut,5);
print "</td></tr>\n";
$i++;

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

@ -37,7 +37,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(DOL_URL_ROOT."/compta/paiement/cheque/index.php",$langs->trans("MenuChequeDeposits"));
$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"));

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

@ -38,7 +38,7 @@ function llxHeader($head = "", $title="") {
$menu->add("liste.php",$langs->trans("Payments"));
$menu->add_submenu("liste.php",$langs->trans("List"));
$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("MenuChequeDeposits"));
$menu->add("rapport.php",$langs->trans("Reportings"));

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

@ -323,7 +323,7 @@ class MenuLeft {
/*
* Menu COMPTA
* Menu COMPTA-FINANCIAL
*/
if ($mainmenu == 'accountancy')
{
@ -390,14 +390,9 @@ class MenuLeft {
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/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);
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
if ($conf->propal->enabled)
{
@ -488,6 +483,15 @@ class MenuLeft {
if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/config.php",$langs->trans("Setup"),1,$user->rights->prelevement->bons->configurer);
}
// Gestion cheques
if ($conf->facture->enabled)
{
$newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=checks",$langs->trans("MenuChequeDeposits"),0,$user->rights->facture->lire);
if (eregi("checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=checks&amp;action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->facture->creer);
if (eregi("checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=checks",$langs->trans("MenuChequesReceipts"),1,$user->rights->facture->lire);
}
// Bank-Caisse
if ($conf->banque->enabled)
{
@ -694,23 +698,30 @@ class MenuLeft {
$user->getrights("adherent");
$newmenu->add(DOL_URL_ROOT."/adherents/index.php?leftmenu=members&amp;mainmenu=members",$langs->trans("Members"),0,$user->rights->adherent->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/fiche.php?action=create",$langs->trans("NewMember"),1,$user->rights->adherent->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php",$langs->trans("List"),1,$user->rights->adherent->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=-1",$langs->trans("MenuMembersToValidate"),1,$user->rights->adherent->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1",$langs->trans("MenuMembersValidated"),1,$user->rights->adherent->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1&amp;filter=outofdate",$langs->trans("MenuMembersNotUpToDate"),1,$user->rights->adherent->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1&amp;filter=uptodate",$langs->trans("MenuMembersUpToDate"),1,$user->rights->adherent->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=0",$langs->trans("MenuMembersResiliated"),1,$user->rights->adherent->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/fiche.php?leftmenu=members&amp;action=create",$langs->trans("NewMember"),1,$user->rights->adherent->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members&amp;statut=-1",$langs->trans("MenuMembersToValidate"),1,$user->rights->adherent->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members&amp;statut=1",$langs->trans("MenuMembersValidated"),1,$user->rights->adherent->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members&amp;statut=1&amp;filter=outofdate",$langs->trans("MenuMembersNotUpToDate"),1,$user->rights->adherent->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members&amp;statut=1&amp;filter=uptodate",$langs->trans("MenuMembersUpToDate"),1,$user->rights->adherent->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members&amp;statut=0",$langs->trans("MenuMembersResiliated"),1,$user->rights->adherent->lire);
$langs->load("compta");
$newmenu->add(DOL_URL_ROOT."/adherents/index.php?leftmenu=accountancy&amp;mainmenu=members",$langs->trans("Subscriptions"),0,$user->rights->adherent->cotisation->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=-1,1&amp;leftmenu=accountancy&amp;mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/cotisations.php?leftmenu=accountancy",$langs->trans("List"),1,$user->rights->adherent->cotisation->lire);
$newmenu->add(DOL_URL_ROOT."/adherents/index.php?leftmenu=members&amp;mainmenu=members",$langs->trans("Subscriptions"),0,$user->rights->adherent->cotisation->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?leftmenu=members&amp;statut=-1,1&amp;mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/adherents/cotisations.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->cotisation->lire);
$langs->load("bills");
$newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/index.php?leftmenu=members_checks",$langs->trans("MenuChequeDeposits"),0,$user->rights->adherent->cotisation->lire);
if (eregi("members_checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/fiche.php?leftmenu=members_checks&amp;action=new",$langs->trans("NewChequeDeposit"),1,$user->rights->adherent->cotisation->creer);
if (eregi("members_checks",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/cheque/liste.php?leftmenu=members_checks",$langs->trans("MenuChequesReceipts"),1,$user->rights->adherent->cotisation->lire);
if ($conf->banque->enabled)
{
$langs->load("banks");
$newmenu->add_submenu(DOL_URL_ROOT."/compta/bank/index.php?leftmenu=accountancy",$langs->trans("Banks"),0,$user->rights->adherent->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/compta/bank/index.php?leftmenu=members",$langs->trans("Banks"),0,$user->rights->adherent->lire);
}
$newmenu->add(DOL_URL_ROOT."/adherents/index.php?leftmenu=export&amp;mainmenu=members",$langs->trans("Exports"),0,$user->rights->adherent->export);

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

@ -96,5 +96,9 @@ TransferDesc=Transfer from one account to another one, Dolibarr will write two r
TransferFrom=From
TransferTo=To
CheckTransmitter=Transmitter
BankChecks=Bank cheques
BankChecksToReceipt=Cheques waiting for deposit
DeleteTransaction=Delete transaction
ConfirmDeleteTransaction=Are you sure you want to delete this transaction ?

14
htdocs/langs/en_US/bills.lang
View File

@ -219,12 +219,10 @@ PaymentTypeCB=Credit card
PaymentTypeShortCB=Credit card
PaymentTypeCHQ=Cheque
PaymentTypeShortCHQ=Cheque
PaymentTypeTYP=TIP
PaymentTypeShortTYP=TIP
PaymentTypeTIP=TIP
PaymentTypeShortTIP=TIP
PaymentTypeVAD=On line payment
PaymentTypeShortVAD=On line payment
BankDetails=Bank details
BankCode=Bank code
DeskCode=Desk code
@ -258,6 +256,14 @@ LawApplicationPart4=leurs prix.
VATDischarged=TVA acquittée sur les débits.
LimitedLiabilityCompanyCapital=SARL au Capital de
UseDiscount=Use discount
MenuChequeDeposits=Cheques deposits
MenuCheques=Cheques
MenuChequesReceipts=Cheques receipts
NewChequeDeposit=New deposit
ChequesReceipts=Cheques receipts
ChequesArea=Cheques deposits area
ChequeDeposits=Cheques deposits
Cheques=Cheques
# oursin PDF model
Of=du

8
htdocs/langs/fr_FR/bills.lang
View File

@ -256,6 +256,14 @@ LawApplicationPart4=leurs prix.
VATDischarged=TVA acquittée sur les débits.
LimitedLiabilityCompanyCapital=SARL au Capital de
UseDiscount=Appliquer remise
MenuChequeDeposits=Remises de chèques
MenuCheques=Gestion chèques
MenuChequesReceipts=Bordereaux
NewChequeDeposit=Nouveau dépot
ChequesReceipts=Bordereaux de remise de chèques
ChequesArea=Espace remises de chèques
ChequeDeposits=Dépots de chèques
Cheques=Chèques
# oursin PDF model
Of=du

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

@ -58,7 +58,7 @@ SalesTurnover=Chiffre d'affaire
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
CheckReceipt=Bordereau de remise de chèques
NewCheckReceipt=Nouvelle remise
NewCheckDeposit=Nouveau dépôt
NewCheckDepositOn=Nouveau dépôt sur compte: %s