From d9248bc8f3fe753cf0f9c75ccb316b6679c1533f Mon Sep 17 00:00:00 2001
From: liedekef <liedekef>
Date: Sun, 14 Jan 2007 19:30:42 +0000
Subject: [PATCH] small language updates en use of $conf->global instead of
gloabl variables for FACTURE_DISABLE_RECUR
---
htdocs/compta/commande/pre.inc.php | 4 ++--
htdocs/compta/pre.inc.php | 4 ++--
htdocs/includes/menus/barre_left/eldy_backoffice.php | 2 +-
htdocs/includes/menus/barre_left/eldy_frontoffice.php | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/htdocs/compta/commande/pre.inc.php b/htdocs/compta/commande/pre.inc.php
index fcb935f725e..3301cae13ea 100644
--- a/htdocs/compta/commande/pre.inc.php
+++ b/htdocs/compta/commande/pre.inc.php
@@ -74,9 +74,9 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add_submenu(DOL_URL_ROOT."/compta/facture/impayees.php",$langs->trans("Unpayed"));
$menu->add_submenu(DOL_URL_ROOT."/compta/paiement/liste.php",$langs->trans("Payments"));
- if (! defined(FACTURE_DISABLE_RECUR) || ! FACTURE_DISABLE_RECUR)
+ if (! $conf->global->FACTURE_DISABLE_RECUR)
{
- $menu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php","R�currentes");
+ $menu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php", $langs->trans("Repeatable"));
}
$menu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/", $langs->trans("Statistics"));
diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php
index c6636befdba..a64f1a353c2 100644
--- a/htdocs/compta/pre.inc.php
+++ b/htdocs/compta/pre.inc.php
@@ -71,9 +71,9 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add_submenu(DOL_URL_ROOT."/compta/facture/impayees.php",$langs->trans("Unpayed"));
$menu->add_submenu(DOL_URL_ROOT."/compta/paiement/liste.php",$langs->trans("Payments"));
- if (! defined(FACTURE_DISABLE_RECUR) || ! FACTURE_DISABLE_RECUR)
+ if (! $conf->global->FACTURE_DISABLE_RECUR)
{
- $menu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php","R�currentes");
+ $menu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php", $langs->trans("Repeatable"));
}
$menu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/", $langs->trans("Statistics"));
diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php
index 8645b04b60c..278b87a4698 100644
--- a/htdocs/includes/menus/barre_left/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php
@@ -379,7 +379,7 @@ class MenuLeft {
{
if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/clients.php?action=facturer&leftmenu=customers_bills",$langs->trans("NewBill"),2,$user->rights->facture->creer);
}
- if (! defined("FACTURE_DISABLE_RECUR") || ! FACTURE_DISABLE_RECUR)
+ if (! $conf->global->FACTURE_DISABLE_RECUR)
{
if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php?leftmenu=customers_bills",$langs->trans("Repeatable"),2,$user->rights->facture->lire);
}
diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
index 90c2b6bcf0c..d04f65b4a6a 100644
--- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
@@ -388,7 +388,7 @@ class MenuLeft {
{
if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/clients.php?action=facturer",$langs->trans("NewBill"),2,$user->rights->facture->creer);
}
- if (! defined("FACTURE_DISABLE_RECUR") || ! FACTURE_DISABLE_RECUR)
+ if (! $conf->global->FACTURE_DISABLE_RECUR)
{
if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php",$langs->trans("Repeatable"),2,$user->rights->facture->lire);
}
--
GitLab