From 4c98a91d34aded28c10ead1e25da602a9620abeb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 23 Jul 2006 10:29:53 +0000
Subject: [PATCH] =?UTF-8?q?New:=20Les=20fonctions=20de=20saisie/consultati?=
=?UTF-8?q?on=20des=20charges=20sociales=20et=20impots=20sont=20mis=20dans?=
=?UTF-8?q?=20un=20module=20=E0=20part=20nomm=E9=20'Taxes=20et=20charges?=
=?UTF-8?q?=20sociales'.=20En=20effet=20ces=20fonctions=20ne=20sont=20pas?=
=?UTF-8?q?=20des=20fonctions=20de=20compta=20pure=20mais=20des=20fonction?=
=?UTF-8?q?s=20de=20tr=E9soreries.=20Ceci=20afin=20d'avoir=20une=20meilleu?=
=?UTF-8?q?r=20ind=E9pendance=20du=20module=20compta.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/compta/commande/pre.inc.php | 20 +++++++++++++-------
htdocs/compta/pre.inc.php | 21 +++++++++++++--------
2 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/htdocs/compta/commande/pre.inc.php b/htdocs/compta/commande/pre.inc.php
index 662aec5c341..fcb935f725e 100644
--- a/htdocs/compta/commande/pre.inc.php
+++ b/htdocs/compta/commande/pre.inc.php
@@ -102,12 +102,12 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/compta/deplacement/", "D�placement");
}
- if (($conf->compta->enabled || $conf->comptaexpert->enabled) && $conf->compta->tva && $user->societe_id == 0)
+ if ($conf->tax->enabled && $conf->compta->tva && $user->societe_id == 0)
{
$menu->add(DOL_URL_ROOT."/compta/tva/index.php",$langs->trans("VAT"));
}
- if ($conf->compta->enabled || $conf->comptaexpert->enabled)
+ if ($conf->tax->enabled)
{
$menu->add(DOL_URL_ROOT."/compta/charges/index.php",$langs->trans("Charges"));
}
@@ -127,12 +127,18 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrders"));
}
- $menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
-
- if ($user->rights->compta->ventilation->parametrer)
+ if ($conf->compta->enabled)
{
- $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param"));
- }
+ if ($user->rights->compta->ventilation->creer)
+ {
+ $menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
+ }
+
+ if ($user->rights->compta->ventilation->parametrer)
+ {
+ $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param"));
+ }
+ }
left_menu($menu->liste, $help_url);
diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php
index 747ab8ca2bf..436e7e3db89 100644
--- a/htdocs/compta/pre.inc.php
+++ b/htdocs/compta/pre.inc.php
@@ -99,12 +99,12 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/compta/deplacement/", $langs->trans("Trips"));
}
- if (($conf->compta->enabled || $conf->comptaexpert->enabled) && $conf->compta->tva && $user->societe_id == 0)
+ if ($conf->tax->enabled && $conf->compta->tva && $user->societe_id == 0)
{
$menu->add(DOL_URL_ROOT."/compta/tva/index.php",$langs->trans("VAT"));
}
- if ($conf->compta->enabled || $conf->comptaexpert->enabled)
+ if ($conf->tax->enabled)
{
$menu->add(DOL_URL_ROOT."/compta/charges/index.php",$langs->trans("Charges"));
}
@@ -124,13 +124,18 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrders"));
}
- $menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
-
- if ($user->rights->compta->ventilation->parametrer)
+ if ($conf->compta->enabled)
{
- $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param"));
- }
-
+ if ($user->rights->compta->ventilation->parametrer)
+ {
+ $menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
+ }
+
+ if ($user->rights->compta->ventilation->parametrer)
+ {
+ $menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param"));
+ }
+ }
left_menu($menu->liste, $help_url);
}
--
GitLab