diff --git a/htdocs/includes/menus/barre_top/auguria_backoffice.php b/htdocs/includes/menus/barre_top/auguria_backoffice.php
index 3af0cd7a3fa..c50964fc8fe 100644
--- a/htdocs/includes/menus/barre_top/auguria_backoffice.php
+++ b/htdocs/includes/menus/barre_top/auguria_backoffice.php
@@ -24,7 +24,7 @@
\remarks La construction d'un gestionnaire pour le menu du haut est simple:
\remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut
\remarks doivent etre affichees par
- \remarks ou si menu selectionne
+ \remarks ou si menu selectionne
*/
@@ -38,42 +38,38 @@ class MenuTop {
var $require_left=array("auguria_backoffice"); // Si doit etre en phase avec un gestionnaire de menu gauche particulier
var $atarget=""; // Valeur du target a utiliser dans les liens
-
+
/**
* \brief Constructeur
* \param db Handler d'acc�s base de donn�e
*/
function MenuTop($db)
{
- global $langs;
$this->db=$db;
-
- $langs->setTransFromTab("Company",$langs->trans("ThirdParty"));
- $langs->setTransFromTab("NewCompany",$langs->trans("NewThirdParty"));
}
-
-
+
+
/**
* \brief Affiche le menu
*/
function showmenu()
{
require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
-
+
global $user,$conf,$langs,$dolibarr_main_db_name;;
-
+
// On sauve en session le menu principal choisi
if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"];
$_SESSION["leftmenuopened"]="";
-
+
$menuArbo = new Menubase($this->db,'auguria','top');
$tabMenu = $menuArbo->menuTopCharger(0,$_SESSION['mainmenu'], 'auguria');
-
+
print '
';
-
+
for($i=0; $i';
}
- }
+ }
}
print '
';
}
-
+
}
?>
diff --git a/htdocs/includes/menus/barre_top/auguria_frontoffice.php b/htdocs/includes/menus/barre_top/auguria_frontoffice.php
index 1da243dda44..52df63ca0ef 100644
--- a/htdocs/includes/menus/barre_top/auguria_frontoffice.php
+++ b/htdocs/includes/menus/barre_top/auguria_frontoffice.php
@@ -24,7 +24,7 @@
\remarks La construction d'un gestionnaire pour le menu du haut est simple:
\remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut
\remarks doivent etre affichees par
- \remarks ou si menu selectionne
+ \remarks ou si menu selectionne
*/
@@ -38,41 +38,37 @@ class MenuTop {
var $require_left=array("auguria_backoffice"); // Si doit etre en phase avec un gestionnaire de menu gauche particulier
var $atarget=""; // Valeur du target a utiliser dans les liens
-
+
/**
* \brief Constructeur
* \param db Handler d'acc�s base de donn�e
*/
function MenuTop($db)
{
- global $langs;
$this->db=$db;
-
- $langs->setTransFromTab("Company",$langs->trans("ThirdParty"));
- $langs->setTransFromTab("NewCompany",$langs->trans("NewThirdParty"));
}
-
-
+
+
/**
* \brief Affiche le menu
*/
function showmenu()
{
require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
-
+
global $user,$conf,$langs,$dolibarr_main_db_name;;
-
+
// On sauve en session le menu principal choisi
if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"];
$_SESSION["leftmenuopened"]="";
-
+
$menuArbo = new Menubase($this->db,'auguria','top');
$tabMenu = $menuArbo->menuTopCharger(1,$_SESSION['mainmenu'], 'auguria');
print '';
-
+
for($i=0; $i';
}
diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php
index 1ba5cea8f29..575f2f4643a 100644
--- a/htdocs/includes/menus/barre_top/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php
@@ -47,11 +47,7 @@ class MenuTop {
*/
function MenuTop($db)
{
- global $langs;
$this->db=$db;
-
- $langs->setTransFromTab("Company",$langs->trans("ThirdParty"));
- $langs->setTransFromTab("NewCompany",$langs->trans("NewThirdParty"));
}
diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
index 4972621ffda..f235753b217 100644
--- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
@@ -47,11 +47,7 @@ class MenuTop {
*/
function MenuTop($db)
{
- global $langs;
$this->db=$db;
-
- $langs->setTransFromTab("Company",$langs->trans("ThirdParty"));
- $langs->setTransFromTab("NewCompany",$langs->trans("NewThirdParty"));
}
diff --git a/htdocs/includes/menus/barre_top/empty.php b/htdocs/includes/menus/barre_top/empty.php
index d690eff1f09..382ab0138a6 100644
--- a/htdocs/includes/menus/barre_top/empty.php
+++ b/htdocs/includes/menus/barre_top/empty.php
@@ -30,33 +30,32 @@ class MenuTop {
var $require_left=array("empty"); // If this top menu handler must be used with a particular left menu handler
var $hideifnotallowed=false; // Put 0 for back office menu, 1 for front office menu
-
+
var $atarget=""; // To store arget to use in menu links
-
+
/**
* \brief Constructor
* \param db Dabatase handler
*/
function MenuTop($db)
{
- global $langs;
$this->db=$db;
}
-
-
+
+
/**
* \brief Show menu
*/
function showmenu()
{
global $user,$conf,$langs,$dolibarr_main_db_name;;
-
+
print '';
}
-
+
}
?>
\ No newline at end of file
diff --git a/htdocs/includes/menus/barre_top/rodolphe.php b/htdocs/includes/menus/barre_top/rodolphe.php
index 68c457cfa27..ad54c8ee754 100644
--- a/htdocs/includes/menus/barre_top/rodolphe.php
+++ b/htdocs/includes/menus/barre_top/rodolphe.php
@@ -25,7 +25,7 @@
\remarks La construction d'un gestionnaire pour le menu du haut est simple:
\remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut
\remarks doivent etre affichees par
- \remarks ou si menu selectionne
+ \remarks ou si menu selectionne
*/
@@ -37,37 +37,33 @@ class MenuTop {
var $require_left=array(); // Si doit etre en phase avec un gestionnaire de menu gauche particulier
var $hideifnotallowed=false; // Put 0 for back office menu, 1 for front office menu
-
+
var $atarget=""; // Valeur du target a utiliser dans les liens
-
+
/**
* \brief Constructeur
* \param db Handler d'acces base de donnee
*/
function MenuTop($db)
{
- global $langs;
$this->db=$db;
-
- $langs->setTransFromTab("Company",$langs->trans("ThirdParty"));
- $langs->setTransFromTab("NewCompany",$langs->trans("NewThirdParty"));
}
-
-
+
+
/**
* \brief Affiche le menu
*/
function showmenu()
{
global $user,$conf,$langs,$dolibarr_main_db_name;;
-
+
// On sauve en session le menu principal choisi
if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"];
$_SESSION["leftmenuopened"]="";
-
+
print '';
}
diff --git a/htdocs/pre.inc.php b/htdocs/pre.inc.php
index 2679a378642..e6f9a1b8710 100644
--- a/htdocs/pre.inc.php
+++ b/htdocs/pre.inc.php
@@ -39,17 +39,13 @@ function llxHeader($head = "")
if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
{
$langs->load("companies");
- $menu->add(DOL_URL_ROOT."/societe.php", $langs->trans("Companies"));
+ $menu->add(DOL_URL_ROOT."/societe.php", $langs->trans("ThirdParties"));
if ($user->rights->societe->creer)
{
- $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create", $langs->trans("MenuNewCompany"));
+ $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create", $langs->trans("MenuNewThirdParty"));
}
- if(is_dir("societe/groupe"))
- {
- $menu->add_submenu(DOL_URL_ROOT."/societe/groupe/index.php", $langs->trans("MenuSocGroup"));
- }
$menu->add_submenu(DOL_URL_ROOT."/contact/index.php",$langs->trans("Contacts"));
}
diff --git a/htdocs/societe/notify/pre.inc.php b/htdocs/societe/notify/pre.inc.php
index 3b712dd66eb..74814ad6310 100644
--- a/htdocs/societe/notify/pre.inc.php
+++ b/htdocs/societe/notify/pre.inc.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2003 Rodolphe Quiedeville
* Copyright (C) 2004-2006 Laurent Destailleur
*
* This program is free software; you can redistribute it and/or modify
@@ -31,25 +31,25 @@ require ("../../main.inc.php");
function llxHeader($head = "")
{
global $langs, $user, $conf;
-
+
top_menu($head);
-
+
$menu = new Menu();
-
+
if ($conf->societe->enabled)
{
- $menu->add(DOL_URL_ROOT."/societe.php", $langs->trans("Companies"),"company");
-
+ $menu->add(DOL_URL_ROOT."/societe.php", $langs->trans("ThirdParties"),"company");
+
if ($conf->rights->societe->creer)
{
- $menu->add_submenu(DOL_URL_ROOT."/soc.php?&action=create", $langs->trans("NewCompany"));
+ $menu->add_submenu(DOL_URL_ROOT."/soc.php?&action=create", $langs->trans("NewThirdParty"));
}
-
+
$menu->add_submenu(DOL_URL_ROOT."/contact.php", $langs->trans("Contacts"));
-
+
$menu->add_submenu("index.php", $langs->trans("Notifications"));
}
-
+
left_menu($menu->liste);
}