From 3d2d9fddcb50ed097b55cd3d0ee5caf3eabadcf8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 4 Nov 2008 16:58:26 +0000 Subject: [PATCH] Trad: Withdrawal module translation --- htdocs/compta/prelevement/config.php | 258 +++++++++--------- htdocs/compta/prelevement/create.php | 25 +- htdocs/compta/prelevement/demandes.php | 6 +- htdocs/compta/prelevement/index.php | 9 +- htdocs/compta/prelevement/liste.php | 6 +- htdocs/compta/prelevement/liste_factures.php | 11 +- htdocs/compta/prelevement/rejets.php | 21 +- htdocs/compta/prelevement/stats.php | 13 +- .../menus/barre_left/eldy_backoffice.php | 4 +- .../menus/barre_left/eldy_frontoffice.php | 4 +- htdocs/langs/en_US/withdrawals.lang | 8 + htdocs/langs/fr_FR/withdrawals.lang | 8 + 12 files changed, 199 insertions(+), 174 deletions(-) diff --git a/htdocs/compta/prelevement/config.php b/htdocs/compta/prelevement/config.php index 39c32ed9389..3578b26c730 100644 --- a/htdocs/compta/prelevement/config.php +++ b/htdocs/compta/prelevement/config.php @@ -18,218 +18,218 @@ */ /** - \file htdocs/compta/prelevement/config.php - \ingroup prelevement - \brief Page configuration des prelevements - \version $Id$ -*/ + \file htdocs/compta/prelevement/config.php + \ingroup prelevement + \brief Page configuration des prelevements + \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); if (!$user->rights->prelevement->bons->lire) - accessforbidden(); +accessforbidden(); if ($_GET["action"] == "set" && $user->rights->prelevement->bons->configurer) { - for ($i = 1 ; $i < 7 ; $i++) - { - dolibarr_set_const($db, $_POST["nom$i"], $_POST["value$i"], $type='chaine'); - } + for ($i = 1 ; $i < 7 ; $i++) + { + dolibarr_set_const($db, $_POST["nom$i"], $_POST["value$i"], $type='chaine'); + } - Header("Location: config.php"); + Header("Location: config.php"); + exit; } if ($_GET["action"] == "addnotif" && $user->rights->prelevement->bons->configurer) { - $bon = new BonPrelevement($db); - $bon->AddNotification($_POST["user"],$_POST["action"]); - - Header("Location: config.php"); + $bon = new BonPrelevement($db); + $bon->AddNotification($_POST["user"],$_POST["action"]); + + Header("Location: config.php"); + exit; } if ($_GET["action"] == "deletenotif" && $user->rights->prelevement->bons->configurer) { - $bon = new BonPrelevement($db); - $bon->DeleteNotificationById($_GET["notif"]); - - Header("Location: config.php"); + $bon = new BonPrelevement($db); + $bon->DeleteNotificationById($_GET["notif"]); + + Header("Location: config.php"); + exit; } /* - * - * - * + * View */ + llxHeader('',$langs->trans("WithdrawalsSetup")); print_fiche_titre($langs->trans("WithdrawalsSetup")); print "
"; -/* - * - * - */ if ($user->rights->prelevement->bons->configurer) - print '
'; +print ''; print ''; print ''; -print ''; +print ''; if ($user->rights->prelevement->bons->configurer) - print ''; +print ''; -print ''; +print ''; print "\n"; -print ''; +print ''; if ($user->rights->prelevement->bons->configurer) { - print ''; + print ''; } print ''; -print ''; +print ''; if ($user->rights->prelevement->bons->configurer) { - print ''; + print ''; } print ''; -print ''; +print ''; if ($user->rights->prelevement->bons->configurer) { - print ''; + print ''; } print ''; -print ''; +print ''; if ($user->rights->prelevement->bons->configurer) { - print ''; + print ''; } print ''; -print ''; +print ''; if ($user->rights->prelevement->bons->configurer) { - print ''; + print ''; } print ''; - -print ''; + +print ''; if ($user->rights->prelevement->bons->configurer) { - print ''; + + print ''; } print ''; if ($user->rights->prelevement->bons->configurer) - print ''; +print ''; print '
Nom'.$langs->trans("Parameter").'Valeur'.$langs->trans("Value").'Valeur Actuelle'.$langs->trans("CurrentValue").'
Num�ro National Emetteur
'.$langs->trans("NumeroNationalEmetter").''; - print ''; - print ''; + print ''; + print ''.PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR.'
Raison sociale
'.$langs->trans("Name").''; - print ''; - print ''; + print ''; + print ''.PRELEVEMENT_RAISON_SOCIALE.'
Code Banque
'.$langs->trans("BankCode").''; - print ''; - print ''; + print ''; + print ''.PRELEVEMENT_CODE_BANQUE.'
Code Guichet
'.$langs->trans("DeskCode").''; - print ''; - print ''; + print ''; + print ''.PRELEVEMENT_CODE_GUICHET.'
Num�ro compte
'.$langs->trans("AccountNumber").''; - print ''; - print ''; + print ''; + print ''.PRELEVEMENT_NUMERO_COMPTE.'
Utilisateur responsable des pr�l�vements
'.$langs->trans("ResponsibleUser").''; - print ''; - print ''; + print ''; + print ''; if (defined("PRELEVEMENT_USER") && PRELEVEMENT_USER > 0) { - $cuser = new User($db, PRELEVEMENT_USER); - $cuser->fetch(); - print $cuser->fullname; + $cuser = new User($db, PRELEVEMENT_USER); + $cuser->fetch(); + print $cuser->fullname; } else { - print PRELEVEMENT_USER; + print PRELEVEMENT_USER; } print '
'; if ($user->rights->prelevement->bons->configurer) - print '
'; +print ''; print '
'; + + /* * Notifications - * + * TODO Use notification module instead */ print_titre($langs->trans("Notifications")); if ($user->rights->prelevement->bons->configurer) - print '
'; +print ''; print ''; print ''; print ''; print ''; if ($user->rights->prelevement->bons->configurer) - print ''; +print ''; print "\n"; if ($user->rights->prelevement->bons->configurer) { - print ''; - - print ''; - - print ''; + + print ''; + + print ''; + + print ''; } @@ -241,35 +241,35 @@ $sql .= " WHERE u.rowid = pn.fk_user"; $resql = $db->query($sql); if ($resql) { - $num = $db->num_rows($resql); - $i = 0; - $var = True; - while ($i < $num) - { - $obj = $db->fetch_object($resql); - - $var=!$var; - print ""; - - print ''; - print ''; - - if ($user->rights->prelevement->bons->configurer) + $num = $db->num_rows($resql); + $i = 0; + $var = True; + while ($i < $num) { - print ''; + $obj = $db->fetch_object($resql); + + $var=!$var; + print ""; + + print ''; + print ''; + + if ($user->rights->prelevement->bons->configurer) + { + print ''; + } + else + { + print ''; + } + $i++; } - else - { - print ''; - } - $i++; - } - $db->free($resql); + $db->free($resql); } print '
NomValeurActionAction
'; - print ''; - print '
'; + print ''; + print ''; - print '
'; + print '
'.stripslashes($obj->firstname)." ".stripslashes($obj->name).''.$obj->action.''.img_delete().'
'.$obj->firstname." ".$obj->name.''.$obj->action.'rowid.'">'.img_delete().'
'; if ($user->rights->prelevement->bons->configurer) - print '
'; +print ''; $db->close(); diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index d40ef76d881..22717407c74 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -14,20 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** \file htdocs/compta/prelevement/create.php \brief Prelevement - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php"); +$langs->load("widthdrawals"); +$langs->load("companies"); +$langs->load("banks"); +$langs->load("bills"); + + if (!$user->rights->prelevement->bons->creer) accessforbidden(); @@ -51,6 +54,10 @@ if ($_GET["action"] == 'create') } +/* + * View + */ + llxHeader(); $h=0; @@ -70,16 +77,16 @@ if ($nb < 0 || $nb1 < 0 || $nb11 < 0) dolibarr_print_error($bprev->error); } print ''; -print ''; +print ''; print ''; -print ''; +print ''; print ''; @@ -103,7 +110,7 @@ if ($nb) } else { - print "Aucune facture en mode de paiement 'Prélevement' n'a de demande de prélèvements en attente.
"; + print $langs->trans("NoInvoiceToWithdraw").'
'; } print '
'; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 4e71530c66a..71a411ed949 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -16,21 +16,19 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** \file htdocs/compta/prelevement/demandes.php \brief Page de la liste des demandes de prélèvements - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); require_once DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php"; $langs->load("widthdrawals"); +$langs->load("companies"); // Security check $socid = isset($_GET["socid"])?$_GET["socid"]:''; diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 0df07d6c79b..8bcc226ef6f 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -16,15 +16,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** \file htdocs/compta/prelevement/index.php \brief Prelevement - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); @@ -61,12 +58,12 @@ $var=true; print '
Nb de facture à prélever :
'.$langs->trans("NbOfInvoiceToWithdraw").''; print $nb; -print 'Notre banque :'; +print ''.$langs->trans("BankCode").''; print $nb1; -print 'Notre agence :'; +print ''.$langs->trans("DeskCode").''; print $nb11; print '
Somme à prélever
'.$langs->trans("AmountToWithdraw").''; print price($bprev->SommeAPrelever()); print '
'; print ''; $var=!$var; -print ''; +print ''; print ''; $var=!$var; -print ''; +print ''; print '
'.$langs->trans("Statistics").'
Nb de facture à prélever
'.$langs->trans("NbOfInvoiceToWithdraw").''; print $bprev->NbFactureAPrelever(); print '
Somme à prélever
'.$langs->trans("AmountToWithdraw").''; print price($bprev->SommeAPrelever()); print '

'; diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index 7e7be9acbd8..d9ba3b70563 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -15,16 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** \file htdocs/compta/prelevement/liste.php \ingroup prelevement \brief Page liste des prelevements - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); @@ -33,6 +30,7 @@ if (!$user->rights->prelevement->bons->lire) accessforbidden(); $langs->load("withdrawals"); +$langs->load("companies"); // Sécurité accés client if ($user->societe_id > 0) diff --git a/htdocs/compta/prelevement/liste_factures.php b/htdocs/compta/prelevement/liste_factures.php index 32fbac681aa..4fe5e3f0256 100644 --- a/htdocs/compta/prelevement/liste_factures.php +++ b/htdocs/compta/prelevement/liste_factures.php @@ -15,16 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** \file htdocs/compta/prelevement/liste_factures.php \ingroup prelevement \brief Page liste des factures prélevées - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); @@ -34,6 +31,12 @@ require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); // Sécurité accés client if ($user->societe_id > 0) accessforbidden(); +$langs->load("companies"); + + +/* + * View + */ llxHeader('',$langs->trans("WithdrawedBills")); diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index 41983719062..ef08f971dcd 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -14,21 +14,28 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ + */ + +/* + * \version $Id$ */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +$langs->load("companies"); + + if (!$user->rights->prelevement->bons->lire) accessforbidden(); // Sécurité accés client if ($user->societe_id > 0) accessforbidden(); +/* + * View + */ llxHeader('','Bon de prélèvement - Rejet'); @@ -92,13 +99,13 @@ if ($result) $num = $db->num_rows($result); $i = 0; - print_barre_liste("Prélèvements rejetés", $page, "rejets.php", $urladd, $sortfield, $sortorder, '', $num); + print_barre_liste($langs->trans("WithdrawsRefused"), $page, "rejets.php", $urladd, $sortfield, $sortorder, '', $num); print"\n\n"; print ''; print ''; - print_liste_field_titre("Ligne N°","rejets.php","p.ref",'',$urladd); - print_liste_field_titre("Société","rejets.php","s.nom",'',$urladd); - print_liste_field_titre("Motif","rejets.php","pr.motif","",$urladd); + print_liste_field_titre($langs->trans("Nb"),"rejets.php","p.ref",'',$urladd); + print_liste_field_titre($langs->trans("ThirdParty"),"rejets.php","s.nom",'',$urladd); + print_liste_field_titre($langs->trans("Reason"),"rejets.php","pr.motif","",$urladd); print ''; $var=True; diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index b5647588f73..4e41ff42644 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -15,15 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** \file htdocs/compta/prelevement/stats.php \brief Page de stats des prélèvements - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); @@ -43,7 +40,7 @@ llxHeader('','Statistiques pr * */ -print_titre("Statistiques prélèvements"); +print_titre($langs->trans("WithdrawStatistics")); $sql = "SELECT sum(pl.amount), count(pl.amount)"; @@ -123,14 +120,16 @@ if ($db->query($sql)) else { dolibarr_print_error($db); -} +} + + /* * * Stats sur les rejets * */ print '
'; -print_titre("Statistiques des rejets de prélèvements"); +print_titre($langs->trans("WithdrawRejectStatistics")); $sql = "SELECT sum(pl.amount), count(pl.amount)"; diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 38ebf539a5e..692ba70f5c5 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -528,12 +528,12 @@ class MenuLeft { $newmenu->add(DOL_URL_ROOT."/compta/prelevement/index.php?leftmenu=withdraw",$langs->trans("StandingOrders"),0,$user->rights->prelevement->bons->lire); + if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/create.php",$langs->trans("NewStandingOrder"),1,$user->rights->prelevement->bons->creer); + //if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("StandingOrder"),1,$user->rights->prelevement->bons->lire); if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php?status=0",$langs->trans("StandingOrderToProcess"),1,$user->rights->prelevement->bons->lire); //if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php?status=1",$langs->trans("StandingOrderProcessed"),2,$user->rights->prelevement->bons->lire); - if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/create.php",$langs->trans("NewStandingOrder"),1,$user->rights->prelevement->bons->creer); - if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/bons.php",$langs->trans("WithdrawalsReceipts"),1,$user->rights->prelevement->bons->lire); if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/liste.php",$langs->trans("WithdrawalsLines"),1,$user->rights->prelevement->bons->lire); if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/liste_factures.php",$langs->trans("WithdrawedBills"),1,$user->rights->prelevement->bons->lire); diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index b537a870aad..ef99dc4ac6e 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -510,12 +510,12 @@ class MenuLeft { $newmenu->add(DOL_URL_ROOT."/compta/prelevement/index.php?leftmenu=withdraw",$langs->trans("StandingOrders"),0,$user->rights->prelevement->bons->lire); + if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/create.php",$langs->trans("NewStandingOrder"),1,$user->rights->prelevement->bons->creer); + //if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("StandingOrder"),1,$user->rights->prelevement->bons->lire); if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php?status=0",$langs->trans("StandingOrderToProcess"),1,$user->rights->prelevement->bons->lire); //if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php?status=1",$langs->trans("StandingOrderProcessed"),2,$user->rights->prelevement->bons->lire); - if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/create.php",$langs->trans("NewStandingOrder"),1,$user->rights->prelevement->bons->creer); - if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/bons.php",$langs->trans("WithdrawalsReceipts"),1,$user->rights->prelevement->bons->lire); if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/liste.php",$langs->trans("WithdrawalsLines"),1,$user->rights->prelevement->bons->lire); if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/liste_factures.php",$langs->trans("WithdrawedBills"),1,$user->rights->prelevement->bons->lire); diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 9b702b3f70e..ef5e38e2563 100755 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -16,3 +16,11 @@ RequestStandingOrderToTreat=Request for standing orders to treat RequestStandingOrderTreated=Request for standing orders treated CustomersStandingOrders=Customer standing orders CustomerStandingOrder=Customer standing order +NbOfInvoiceToWithdraw=Nb of invoice to withdraw +AmountToWithdraw=Amount to withdraw +WithdrawsRefused=Withdraws refused +NoInvoiceToWithdraw=No invoice in payment mode "withdraw" is waiting +ResponsibleUser=Responsible user +WithdrawalsSetup=Withdrawal setup +WithdrawStatistics=Withdraws' statistics +WithdrawRejectStatistics=Withdraw rejects' statistics diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang index 47675fbbbda..f9a8af6201b 100755 --- a/htdocs/langs/fr_FR/withdrawals.lang +++ b/htdocs/langs/fr_FR/withdrawals.lang @@ -16,3 +16,11 @@ RequestStandingOrderToTreat=Demandes de pr RequestStandingOrderTreated=Demandes de prélèvements traitées CustomersStandingOrders=Prélèvements clients CustomerStandingOrder=Prélèvement client +NbOfInvoiceToWithdraw=Nb de facture à prélever +AmountToWithdraw=Somme à prélever +WithdrawsRefused=Prélèvements rejetés +NoInvoiceToWithdraw=Aucune facture en mode de paiement 'Prélevement' n'a de demande de prélèvements en attente +ResponsibleUser=Utilisateur responsable des prélèvements +WithdrawalsSetup=Configuration des prélèvements +WithdrawStatistics=Statistiques des prélèvements +WithdrawRejectStatistics=Statistiques des rejets de prélèvements