diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index 3973a5cca11..5ff7fd83590 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -32,6 +32,7 @@ require("./pre.inc.php"); if (!$user->rights->prelevement->bons->lire) accessforbidden(); +$langs->load("withdrawals"); // Sécurité accés client if ($user->societe_id > 0) @@ -47,7 +48,7 @@ if ($user->societe_id > 0) * */ -llxHeader('','Lignes de Prélèvements'); +llxHeader('',$langs->trans("WithdrawalsLines")); $page = $_GET["page"]; $sortorder = (empty($_GET["sortorder"])) ? "DESC" : $_GET["sortorder"]; @@ -96,7 +97,7 @@ if ($result) $urladd = "&statut=".$_GET["statut"]; $urladd .= "&search_bon=".$_GET["search_bon"]; - print_barre_liste("Lignes de prélèvements", $page, "liste.php", $urladd, $sortfield, $sortorder, '', $num); + print_barre_liste($langs->trans("WithdrawalsLines"), $page, "liste.php", $urladd, $sortfield, $sortorder, '', $num); print"\n\n"; print ''; diff --git a/htdocs/compta/prelevement/liste_factures.php b/htdocs/compta/prelevement/liste_factures.php index f76edc7518d..2d4b11fcf50 100644 --- a/htdocs/compta/prelevement/liste_factures.php +++ b/htdocs/compta/prelevement/liste_factures.php @@ -35,7 +35,7 @@ require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); if ($user->societe_id > 0) accessforbidden(); -llxHeader('','Bon de prélèvement'); +llxHeader('',$langs->trans("WithdrawedBills")); $page = $_GET["page"]; $sortorder = (empty($_GET["sortorder"])) ? "DESC" : $_GET["sortorder"]; @@ -87,7 +87,7 @@ if ($result) $urladd = "&socid=".$_GET["socid"]; - print_barre_liste("Factures prélevées", $page, "liste_factures.php", $urladd, $sortfield, $sortorder, '', $num); + print_barre_liste($langs->trans("WithdrawedBills"), $page, "liste_factures.php", $urladd, $sortfield, $sortorder, '', $num); print"\n\n"; print '
'; diff --git a/htdocs/includes/menus/barre_left/eldy.php b/htdocs/includes/menus/barre_left/eldy.php index 2ee5dec9d6c..809a30ad355 100644 --- a/htdocs/includes/menus/barre_left/eldy.php +++ b/htdocs/includes/menus/barre_left/eldy.php @@ -368,18 +368,21 @@ class MenuLeft { { $langs->load("withdrawals"); $langs->load("banks"); + $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/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("Receipts"),1,$user->rights->prelevement->bons->lire); - if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/liste.php",$langs->trans("List"),1,$user->rights->prelevement->bons->lire); - if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/liste_factures.php",$langs->trans("Bills"),1,$user->rights->prelevement->bons->lire); + + 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); if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/rejets.php",$langs->trans("Rejects"),1,$user->rights->prelevement->bons->lire); if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/stats.php",$langs->trans("Statistics"),1,$user->rights->prelevement->bons->lire); - 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"),2,$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/config.php",$langs->trans("Setup"),1,$user->rights->prelevement->bons->configurer); } diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 8a7c3bc4e49..a13de167c70 100755 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -2,9 +2,12 @@ StandingOrdersArea=Standing orders area StandingOrders=Standing orders StandingOrder=Standing orders +NewStandingOrder=New standing order Withdrawals=Withdrawals Withdrawal=Withdrawal WithdrawalsReceipts=Withdrawals receipts WithdrawalReceipt=Withdrawal receipt WithdrawalReceiptShort=Receipt -LastWithdrawalReceipts=Last %s withdrawal receipts \ No newline at end of file +LastWithdrawalReceipts=Last %s withdrawal receipts +WithdrawedBills=Withdrawed invoices +WithdrawalsLines=Withdrawals lines diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang index 9ea2645e0d4..4023b3ef28b 100755 --- a/htdocs/langs/fr_FR/withdrawals.lang +++ b/htdocs/langs/fr_FR/withdrawals.lang @@ -9,3 +9,5 @@ WithdrawalsReceipts=Bons de pr WithdrawalReceipt=Bon de prélèvement WithdrawalReceiptShort=Bon LastWithdrawalReceipts=Les %s derniers bons de traitement +WithdrawedBills=Factures prélevées +WithdrawalsLines=Lignes de prélèvements