diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php
index 3da77a80c4e5029d84e7cc2c5bfa4feac5fb0f27..7ce4351b09d24343ddd58506cc0db96e537d1dda 100644
--- a/htdocs/compta/bank/pre.inc.php
+++ b/htdocs/compta/bank/pre.inc.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.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
* it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@ function llxHeader($head = "")
if ($user->rights->banque->modifier)
{
- $menu->add_submenu(DOL_URL_ROOT."/compta/bank/virement.php","Virement");
+ $menu->add_submenu(DOL_URL_ROOT."/compta/bank/virement.php",$langs->trans("Virements"));
}
if ($user->rights->banque->configurer)
diff --git a/htdocs/compta/charges/pre.inc.php b/htdocs/compta/charges/pre.inc.php
index cb47d9ce9ae617ce358991d5e125707749d3f95a..101b51a46b6dc302178d9f13a4bb653692284d1d 100644
--- a/htdocs/compta/charges/pre.inc.php
+++ b/htdocs/compta/charges/pre.inc.php
@@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005 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
@@ -23,7 +24,7 @@ require("../../main.inc.php");
function llxHeader($head = "")
{
- global $user, $conf;
+ global $user, $conf, $langs;
/*
@@ -34,9 +35,9 @@ function llxHeader($head = "")
$menu = new Menu();
- $menu->add("index.php","Charges");
+ $menu->add("index.php",$langs->trans("Charges"));
- $menu->add_submenu(DOL_URL_ROOT."/compta/sociales/index.php","Prest. Sociales");
+ $menu->add_submenu(DOL_URL_ROOT."/compta/sociales/index.php",$langs->trans("SocialContributions"));
left_menu($menu->liste);
}
diff --git a/htdocs/compta/deplacement/pre.inc.php b/htdocs/compta/deplacement/pre.inc.php
index 8a1677b4b8c6b0cd8ec8ee0b6f6f9025c1254e5f..b91c1f2aabbbcba6ceeb34b2405a53e20bbcc571 100644
--- a/htdocs/compta/deplacement/pre.inc.php
+++ b/htdocs/compta/deplacement/pre.inc.php
@@ -28,7 +28,7 @@ $deplacement_type[0] = "voiture";
//$deplacement_type[2] = "avion";
function llxHeader($head = "") {
- global $user, $conf;
+ global $user, $conf, $langs;
/*
diff --git a/htdocs/compta/export/pre.inc.php b/htdocs/compta/export/pre.inc.php
index d6cde3c3e883f371984f55e2f3eb942d811e5b93..db756f7a262f8c8db00ccc354bc6ca801b72901c 100644
--- a/htdocs/compta/export/pre.inc.php
+++ b/htdocs/compta/export/pre.inc.php
@@ -44,7 +44,7 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
$menu->add(DOL_URL_ROOT."/compta/export/",$langs->trans("Export"));
- $menu->add_submenu(DOL_URL_ROOT."/compta/export/liste.php",$langs->trans("Liste"));
+ $menu->add_submenu(DOL_URL_ROOT."/compta/export/liste.php",$langs->trans("List"));
left_menu($menu->liste, $help_url);
diff --git a/htdocs/compta/facture/pre.inc.php b/htdocs/compta/facture/pre.inc.php
index 0e320ff1a843cd970538d34337ed7005da768006..1bc90330e377cf1bb9c5039e7fcd55762f830105 100644
--- a/htdocs/compta/facture/pre.inc.php
+++ b/htdocs/compta/facture/pre.inc.php
@@ -32,7 +32,7 @@ require("../../main.inc.php");
require_once("../../facture.class.php");
function llxHeader($head = "", $title="", $help_url='') {
- global $conf, $langs;
+ global $user, $conf, $langs;
$langs->load("companies");
$langs->load("bills");
/*
@@ -49,7 +49,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("Pr�l�vements"));
+ $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrder"));
left_menu($menu->liste, $help_url);
}
diff --git a/htdocs/compta/paiement/pre.inc.php b/htdocs/compta/paiement/pre.inc.php
index 9d9364d6f6f6035628b48a21ac0d5628fa3dcf91..8dbbf54376c01766a1e901755612b3d0a37388ff 100644
--- a/htdocs/compta/paiement/pre.inc.php
+++ b/htdocs/compta/paiement/pre.inc.php
@@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005 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
@@ -22,7 +23,7 @@
require("../../main.inc.php");
function llxHeader($head = "") {
- global $user, $conf;
+ global $user, $conf, $langs;
/*
@@ -33,13 +34,13 @@ function llxHeader($head = "") {
$menu = new Menu();
- $menu->add("liste.php","Liste");
+ $menu->add("liste.php",$langs->trans("List"));
$menu->add("rapport.php","Rapports");
- $menu->add("../facture.php","Factures");
+ $menu->add("../facture.php",$langs->trans("Bills"));
- $menu->add_submenu("liste.php","Paiements");
+ $menu->add_submenu("liste.php",$langs->trans("Payments"));
left_menu($menu->liste);
}
diff --git a/htdocs/compta/param/pre.inc.php b/htdocs/compta/param/pre.inc.php
index b75c374d111f4d08ab87160408d09d8cb569953d..d8ec1621b06dd2d01d3f1a48b19b9bfd7bd27934 100644
--- a/htdocs/compta/param/pre.inc.php
+++ b/htdocs/compta/param/pre.inc.php
@@ -30,7 +30,7 @@ require("../../main.inc.php");
function llxHeader($head = "", $title="", $help_url='')
{
- global $user, $langs;
+ global $user, $conf, $langs;
$user->getrights('banque');
diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php
index a38936f1891946bef51acccdf565500091e4911d..d22d5bf495a35be75f6f5b8e58e5d405f6b713cc 100644
--- a/htdocs/compta/pre.inc.php
+++ b/htdocs/compta/pre.inc.php
@@ -96,7 +96,7 @@ function llxHeader($head = "", $title="", $help_url='')
if ($conf->compta->enabled)
{
- $menu->add(DOL_URL_ROOT."/compta/charges/index.php","Charges");
+ $menu->add(DOL_URL_ROOT."/compta/charges/index.php",$langs->trans("Charges"));
}
@@ -107,16 +107,11 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/compta/bank/",$langs->trans("Bank"));
}
- if ($conf->caisse->enabled)
- {
- $menu->add(DOL_URL_ROOT."/compta/caisse/index.php","Caisses");
- }
-
$menu->add(DOL_URL_ROOT."/compta/stats/","CA / R�sultats");
if ($conf->prelevement->enabled)
{
- $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("Withdrawls"));
+ $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrder"));
}
$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 41861a44106ab4f77fe0a1940962c95ee53a0756..b4c1897bedf0947b28fcaf2ddadd79c07a794568 100644
--- a/htdocs/compta/prelevement/pre.inc.php
+++ b/htdocs/compta/prelevement/pre.inc.php
@@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005 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
@@ -40,10 +41,10 @@ function llxHeader($head = "", $title="", $help_url='')
if ($conf->prelevement->enabled)
{
- $menu->add(DOL_URL_ROOT."/compta/prelevement/","Pr�l�vements");
+ $menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrder"));
$menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/bons.php","Bons");
$menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/rejets.php","Rejets");
- $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/stats.php","Statistiques");
+ $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");
diff --git a/htdocs/compta/resultat/pre.inc.php b/htdocs/compta/resultat/pre.inc.php
index 3da5c3e735f6b88cddca6ed01d080e0fb8b52a49..275c8ee2ac465a28baa21355400af599e9ea39f9 100644
--- a/htdocs/compta/resultat/pre.inc.php
+++ b/htdocs/compta/resultat/pre.inc.php
@@ -23,7 +23,7 @@
require("../../main.inc.php");
function llxHeader($head = "") {
- global $conf;
+ global $user, $conf, $langs;
/*
*
@@ -46,8 +46,8 @@ function llxHeader($head = "") {
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/comp.php","Transform�");
}
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/exercices.php","Evolution");
- $menu->add_submenu(DOL_URL_ROOT."/compta/stats/casoc.php","Par soci�t�");
- $menu->add_submenu(DOL_URL_ROOT."/compta/stats/cabyuser.php","Par utilisateur");
+ $menu->add_submenu(DOL_URL_ROOT."/compta/stats/casoc.php",$langs->trans("ByCompanies"));
+ $menu->add_submenu(DOL_URL_ROOT."/compta/stats/cabyuser.php",$langs->trans("ByUsers"));
left_menu($menu->liste);
}
diff --git a/htdocs/compta/sociales/pre.inc.php b/htdocs/compta/sociales/pre.inc.php
index 978bc43e48f432fe26b40d7223f4189b0105ab99..320eaad333ff7e1838e55ed439a6bba49c1176a4 100644
--- a/htdocs/compta/sociales/pre.inc.php
+++ b/htdocs/compta/sociales/pre.inc.php
@@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005 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
@@ -23,7 +24,7 @@ require("../../main.inc.php");
function llxHeader($head = "")
{
- global $user, $conf;
+ global $user, $conf, $langs;
/*
@@ -34,8 +35,8 @@ function llxHeader($head = "")
$menu = new Menu();
- $menu->add("../charges/","Charges");
- $menu->add_submenu("index.php","Prest. Sociales");
+ $menu->add("../charges/",$langs->trans("Charges"));
+ $menu->add_submenu("index.php",$langs->trans("SocialContributions"));
// $menu->add_submenu("/compta/sociales/conf.php","Conf");
left_menu($menu->liste);
diff --git a/htdocs/compta/stats/pre.inc.php b/htdocs/compta/stats/pre.inc.php
index 4aa0880db8514ec169bcb9c143dbb32ba2359493..5e050d198465f030576e18a3568ee6c278241fa1 100644
--- a/htdocs/compta/stats/pre.inc.php
+++ b/htdocs/compta/stats/pre.inc.php
@@ -23,7 +23,7 @@
require("../../main.inc.php");
function llxHeader($head = "") {
- global $conf;
+ global $user, $conf, $langs;
/*
*
@@ -46,8 +46,8 @@ function llxHeader($head = "") {
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/comp.php","Transform�");
}
$menu->add_submenu(DOL_URL_ROOT."/compta/stats/exercices.php","Evolution");
- $menu->add_submenu(DOL_URL_ROOT."/compta/stats/casoc.php","Par soci�t�");
- $menu->add_submenu(DOL_URL_ROOT."/compta/stats/cabyuser.php","Par utilisateur");
+ $menu->add_submenu(DOL_URL_ROOT."/compta/stats/casoc.php",$langs->trans("ByCompanies"));
+ $menu->add_submenu(DOL_URL_ROOT."/compta/stats/cabyuser.php",$langs->trans("ByUsers"));
left_menu($menu->liste);
}
diff --git a/htdocs/compta/tva/pre.inc.php b/htdocs/compta/tva/pre.inc.php
index c3e250182351013adebb5c3317cf219d198a9c0e..79afb9830b74b52490873e87659974d53911b554 100644
--- a/htdocs/compta/tva/pre.inc.php
+++ b/htdocs/compta/tva/pre.inc.php
@@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005 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
@@ -22,7 +23,7 @@
require("../../main.inc.php");
function llxHeader($head = "") {
- global $user, $conf;
+ global $user, $conf, $langs;
/*
@@ -33,10 +34,10 @@ function llxHeader($head = "") {
$menu = new Menu();
- $menu->add("index.php","TVA");
+ $menu->add("index.php",$langs->trans("VAT"));
- $menu->add_submenu("reglement.php","R�glements");
- $menu->add_submenu("fiche.php?action=create","Nouveau r�glement");
+ $menu->add_submenu("reglement.php",$langs->trans("Payments"));
+ $menu->add_submenu("fiche.php?action=create",$langs->trans("NewPayment"));
left_menu($menu->liste);
}
diff --git a/htdocs/compta/ventilation/pre.inc.php b/htdocs/compta/ventilation/pre.inc.php
index be6e47e2882e45624fe7b3e2f801cd6b1bde1d91..71440f8790a35541ba1c9405b877a0d5fdba50db 100644
--- a/htdocs/compta/ventilation/pre.inc.php
+++ b/htdocs/compta/ventilation/pre.inc.php
@@ -38,8 +38,6 @@ function llxHeader($head = "", $title="", $help_url='')
$menu = new Menu();
- // Les recettes
-
$menu->add(DOL_URL_ROOT."/compta/clients.php", $langs->trans("Customers"));
$menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
diff --git a/htdocs/compta/voyage/pre.inc.php b/htdocs/compta/voyage/pre.inc.php
index 9e45fa0950c6f1b3830f6ae31e27320fea52cd3c..8923355074fb89848779c82151709960702de8fe 100644
--- a/htdocs/compta/voyage/pre.inc.php
+++ b/htdocs/compta/voyage/pre.inc.php
@@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* $Id$
* $Source$
@@ -22,7 +23,7 @@
require("../../main.inc.php");
function llxHeader($head = "") {
- global $user, $conf;
+ global $user, $conf, $langs;
/*
@@ -33,16 +34,16 @@ function llxHeader($head = "") {
$menu = new Menu();
- $menu->add("index.php","Voyages");
+ $menu->add("index.php",$langs->trans("Trips"));
- $menu->add_submenu("index.php","Voyages");
+ $menu->add_submenu("index.php",$langs->trans("Trips"));
$menu->add_submenu("bilan.php","Bilan");
$menu->add_submenu("reduc.php","Reduc");
- $menu->add_submenu("voyage.php","Voyage");
+ $menu->add_submenu("voyage.php",$langs->trans("Trip"));
- $menu->add("/compta/facture.php","Factures");
+ $menu->add("/compta/facture.php",$langs->trans("Bills"));
- $menu->add("/compta/bank/index.php","Bank");
+ $menu->add("/compta/bank/index.php",$langs->trans("Bank"));
left_menu($menu->liste);