Qual: Removed deprecated code

This commit is contained in:
Laurent Destailleur 2009-02-01 13:42:12 +00:00
parent 971a470dde
commit d48bfc3fcb
8 changed files with 72 additions and 97 deletions

View File

@ -45,11 +45,7 @@ class MenuTop {
*/ */
function MenuTop($db) function MenuTop($db)
{ {
global $langs;
$this->db=$db; $this->db=$db;
$langs->setTransFromTab("Company",$langs->trans("ThirdParty"));
$langs->setTransFromTab("NewCompany",$langs->trans("NewThirdParty"));
} }

View File

@ -45,11 +45,7 @@ class MenuTop {
*/ */
function MenuTop($db) function MenuTop($db)
{ {
global $langs;
$this->db=$db; $this->db=$db;
$langs->setTransFromTab("Company",$langs->trans("ThirdParty"));
$langs->setTransFromTab("NewCompany",$langs->trans("NewThirdParty"));
} }

View File

@ -47,11 +47,7 @@ class MenuTop {
*/ */
function MenuTop($db) function MenuTop($db)
{ {
global $langs;
$this->db=$db; $this->db=$db;
$langs->setTransFromTab("Company",$langs->trans("ThirdParty"));
$langs->setTransFromTab("NewCompany",$langs->trans("NewThirdParty"));
} }

View File

@ -47,11 +47,7 @@ class MenuTop {
*/ */
function MenuTop($db) function MenuTop($db)
{ {
global $langs;
$this->db=$db; $this->db=$db;
$langs->setTransFromTab("Company",$langs->trans("ThirdParty"));
$langs->setTransFromTab("NewCompany",$langs->trans("NewThirdParty"));
} }

View File

@ -40,7 +40,6 @@ class MenuTop {
*/ */
function MenuTop($db) function MenuTop($db)
{ {
global $langs;
$this->db=$db; $this->db=$db;
} }

View File

@ -47,11 +47,7 @@ class MenuTop {
*/ */
function MenuTop($db) function MenuTop($db)
{ {
global $langs;
$this->db=$db; $this->db=$db;
$langs->setTransFromTab("Company",$langs->trans("ThirdParty"));
$langs->setTransFromTab("NewCompany",$langs->trans("NewThirdParty"));
} }

View File

@ -39,17 +39,13 @@ function llxHeader($head = "")
if (! empty($conf->societe->enabled) && $user->rights->societe->lire) if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
{ {
$langs->load("companies"); $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) 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")); $menu->add_submenu(DOL_URL_ROOT."/contact/index.php",$langs->trans("Contacts"));
} }

View File

@ -38,11 +38,11 @@ function llxHeader($head = "")
if ($conf->societe->enabled) 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) 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(DOL_URL_ROOT."/contact.php", $langs->trans("Contacts"));