diff --git a/htdocs/compta/facture/pre.inc.php b/htdocs/compta/facture/pre.inc.php index 46d5bf9f6bf..37e875d6a4d 100644 --- a/htdocs/compta/facture/pre.inc.php +++ b/htdocs/compta/facture/pre.inc.php @@ -51,7 +51,7 @@ function llxHeader($head = "", $title="", $help_url='') { $menu->add(DOL_URL_ROOT."/compta/facture.php",$langs->trans("Bills")); $menu->add_submenu(DOL_URL_ROOT."/compta/facture/impayees.php",$langs->trans("Unpayed")); - $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrder")); + $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrders")); left_menu($menu->liste, $help_url); } diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php index d22d5bf495a..1d7b200c21c 100644 --- a/htdocs/compta/pre.inc.php +++ b/htdocs/compta/pre.inc.php @@ -111,7 +111,7 @@ function llxHeader($head = "", $title="", $help_url='') if ($conf->prelevement->enabled) { - $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrder")); + $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrders")); } $menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation")); diff --git a/htdocs/compta/prelevement/pre.inc.php b/htdocs/compta/prelevement/pre.inc.php index 89407ddbbc2..0546d42be64 100644 --- a/htdocs/compta/prelevement/pre.inc.php +++ b/htdocs/compta/prelevement/pre.inc.php @@ -21,10 +21,10 @@ * */ -/*! - \file htdocs/compta/prelevement/pre.inc.php - \ingroup prelevement - \brief Fichier gestionnaire du menu prelevement +/** + \file htdocs/compta/prelevement/pre.inc.php + \ingroup prelevement + \brief Fichier gestionnaire du menu prelevement */ require("../../main.inc.php"); @@ -41,17 +41,18 @@ function llxHeader($head = "", $title="", $help_url='') if ($conf->prelevement->enabled) { - $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrder")); - $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/liste.php","Liste"); + $langs->load("banks"); - $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/bons.php","Bons"); - $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/rejets.php","Rejets"); + $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrders")); + $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/liste.php",$langs->trans("List")); + $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/bons.php",$langs->trans("Receipts")); + $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/rejets.php",$langs->trans("Rejects")); $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/facturesrejets.php","Factures Rejetées"); $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/stats.php",$langs->trans("Statistics")); - $menu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php","Demandes"); - $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php","A Traiter"); - $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandestraitees.php","Traitées"); + $menu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("Demandes")); + $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("StandingOrderToProcess")); + $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandestraitees.php",$langs->trans("StandingOrderProcessed")); } $langs->load("bills"); diff --git a/htdocs/includes/menus/barre_left/eldy.php b/htdocs/includes/menus/barre_left/eldy.php index c3800d78b00..6c78f2845da 100644 --- a/htdocs/includes/menus/barre_left/eldy.php +++ b/htdocs/includes/menus/barre_left/eldy.php @@ -268,17 +268,20 @@ class MenuLeft { if ($leftmenu=="customers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/", $langs->trans("Statistics"),2); } + // Dons if ($conf->don->enabled) { $langs->load("donations"); $newmenu->add(DOL_URL_ROOT."/compta/dons/index.php?leftmenu=donations&mainmenu=",$langs->trans("Donations")); } + // Déplacements if ($conf->deplacement->enabled) { $newmenu->add(DOL_URL_ROOT."/compta/deplacement/index.php?leftmenu=deplacement", "Déplacement"); } + // Charges if ($conf->compta->enabled) { $newmenu->add(DOL_URL_ROOT."/compta/charges/index.php?leftmenu=charges",$langs->trans("Charges")); @@ -310,11 +313,15 @@ class MenuLeft { } + // Prélèvements if ($conf->prelevement->enabled) { $newmenu->add(DOL_URL_ROOT."/compta/prelevement/index.php?leftmenu=withdraw",$langs->trans("StandingOrders")); - if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/bons.php","Bons"); - if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php","Demandes"); + if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/bons.php",$langs->trans("Receipts")); + if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/rejets.php",$langs->trans("Rejects")); + if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/stats.php",$langs->trans("Statistics")); + if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("StandingOrderToProcess")); + if ($leftmenu=="withdraw") $newmenu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandestraitees.php",$langs->trans("StandingOrderProcessed")); } // Bilan, résultats diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index 9b4906c4ebf..44bd2235247 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -21,4 +21,6 @@ BankAccountDomiciliation=Account address BankAccountOwner=Account owner name BankAccountOwnerAddress=Account owner address NewBankAccount=New bank account -CreateAccount=Create account \ No newline at end of file +CreateAccount=Create account +StandingOrderToProcess=To process +StandingOrderProcessed=Processed \ No newline at end of file diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index f9f6957c07c..b092a9542c1 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -169,4 +169,6 @@ Topic=Sujet ByCompanies=By companies ByUsers=By users Links=Links -Link=Link \ No newline at end of file +Link=Link +Receipts=Receipts +Rejects=Rejects \ No newline at end of file diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang index af219f1e448..bec5890998c 100644 --- a/htdocs/langs/fr_FR/banks.lang +++ b/htdocs/langs/fr_FR/banks.lang @@ -21,4 +21,6 @@ BankAccountDomiciliation=Domiciliation du compte BankAccountOwner=Nom du propriétaire du compte BankAccountOwnerAddress=Adresse du propriétaire du compte NewBankAccount=Nouveau compte bancaire -CreateAccount=Créer compte \ No newline at end of file +CreateAccount=Créer compte +StandingOrderToProcess=A traiter +StandingOrderProcessed=Traités \ No newline at end of file diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 5406864a04e..3bc52960b58 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -170,4 +170,6 @@ Topic=Sujet ByCompanies=Par sociétés ByUsers=Par utilisateurs Links=Liens -Link=Lien \ No newline at end of file +Link=Lien +Receipts=Bons +Rejects=Rejets \ No newline at end of file