From af3d630915d9d3901d4cbde35b90fee0827f5f1d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Jul 2004 22:34:12 +0000 Subject: [PATCH] =?UTF-8?q?Les=20acc=E8s=20menu=20pour=20Banque=20n'=E9tai?= =?UTF-8?q?ent=20pas=20accessibles=20si=20le=20module=20compta=20=E9tait?= =?UTF-8?q?=20d=E9sactiv=E9.=20Hors=20le=20module=20banque=20est=20un=20mo?= =?UTF-8?q?dule=20de=20tr=E9sorerie=20et=20peut=20tr=E8s=20bien=20fonction?= =?UTF-8?q?ner=20sans=20compta=20(pour=20les=20utilisateurs=20qui=20saisis?= =?UTF-8?q?sent=20toutes=20leurs=20transactions=20une=20=E0=20une=20hors?= =?UTF-8?q?=20factures).=20Les=20acc=E8s=20au=20module=20Banque=20ont=20do?= =?UTF-8?q?nc=20=E9t=E9=20conditionn=E9es=20sur=20le=20module=20Banque=20e?= =?UTF-8?q?t=20l'entr=E9e=20de=20menu=20Compta=20reste=20apparente=20si=20?= =?UTF-8?q?le=20module=20Banque=20est=20toujours=20actif.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/pre.inc.php | 19 +++++++++++-------- htdocs/includes/menus/barre_top/default.php | 6 +++--- htdocs/includes/modules/modBanque.class.php | 2 -- htdocs/includes/modules/modCaisse.class.php | 8 ++++---- htdocs/main.inc.php | 8 ++++++++ 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php index 7d3d1c83bc4..1a1c9449c2d 100644 --- a/htdocs/compta/pre.inc.php +++ b/htdocs/compta/pre.inc.php @@ -72,21 +72,24 @@ function llxHeader($head = "", $title="") { $menu->add(DOL_URL_ROOT."/compta/deplacement/", "Déplacement"); } - if ($conf->compta->tva && $user->societe_id == 0) + if ($conf->compta->enabled && $conf->compta->tva && $user->societe_id == 0) { $menu->add(DOL_URL_ROOT."/compta/tva/index.php","TVA"); } - $menu->add(DOL_URL_ROOT."/compta/charges/index.php","Charges"); - + if ($conf->compta->enabled) + { + $menu->add(DOL_URL_ROOT."/compta/charges/index.php","Charges"); + } // Vision des recettes-dépenses - - $menu->add(DOL_URL_ROOT."/compta/bank/","Banques"); - - if ($user->societe_id == 0) + if ($conf->banque->enabled) + { + $menu->add(DOL_URL_ROOT."/compta/bank/","Banques"); + } + if ($conf->caisse->enabled) { - $menu->add(DOL_URL_ROOT."/compta/caisse/index.php","Caisse"); + $menu->add(DOL_URL_ROOT."/compta/caisse/index.php","Caisses"); } $menu->add(DOL_URL_ROOT."/compta/stats/","CA / Résultats"); diff --git a/htdocs/includes/menus/barre_top/default.php b/htdocs/includes/menus/barre_top/default.php index e15ef3d6169..40d1f4c0298 100644 --- a/htdocs/includes/menus/barre_top/default.php +++ b/htdocs/includes/menus/barre_top/default.php @@ -26,7 +26,7 @@ global $PHP_SELF; $nbofentries=0; if ($conf->commercial->enabled) $nbofentries++; if ($conf->adherent->enabled) $nbofentries++; -if ($conf->compta->enabled) $nbofentries++; +if ($conf->compta->enabled || $conf->banque->enabled || $conf->caisse->enabled) $nbofentries++; if ($conf->produit->enabled || $conf->service->enabled) $nbofentries++; if ($conf->webcal->enabled) $nbofentries++; @@ -59,13 +59,13 @@ else print ''; } - if ($conf->compta->enabled) + if ($conf->compta->enabled || $conf->banque->enabled || $conf->caisse->enabled) { $class=""; if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "compta") { $class="menusel"; } elseif (ereg("^".DOL_URL_ROOT."\/compta\/",$PHP_SELF)) { $class="menusel"; } print ''; - print 'Compta'; + print 'Compta/Tréso'; print ''; } diff --git a/htdocs/includes/modules/modBanque.class.php b/htdocs/includes/modules/modBanque.class.php index 1d12c102860..208a828c9cb 100644 --- a/htdocs/includes/modules/modBanque.class.php +++ b/htdocs/includes/modules/modBanque.class.php @@ -39,8 +39,6 @@ class modBanque extends DolibarrModules $this->family = "financial"; $this->name = "Banque"; $this->description = "Gestion des comptes fincanciers de type Comptes bancaires ou postaux"; - $this->const_name = "MAIN_MODULE_CAISSE"; - $this->const_config = MAIN_MODULE_CAISSE; $this->const_name = "MAIN_MODULE_BANQUE"; $this->const_config = MAIN_MODULE_BANQUE; diff --git a/htdocs/includes/modules/modCaisse.class.php b/htdocs/includes/modules/modCaisse.class.php index 1c5e4b1ff29..c6b148ff3ac 100644 --- a/htdocs/includes/modules/modCaisse.class.php +++ b/htdocs/includes/modules/modCaisse.class.php @@ -60,10 +60,10 @@ class modCaisse extends DolibarrModules * Permissions */ $sql = array( - "insert into ".MAIN_DB_PREFIX."rights_def values (120,'Tous les droits sur les caisses','banque','a',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (121,'Lire les caisses liquide','banque','r',1);", - "insert into ".MAIN_DB_PREFIX."rights_def values (121,'Créer, supprimer transactions','banque','r',1);", - "insert into ".MAIN_DB_PREFIX."rights_def values (123,'Configurer les caisses (créer, gérer catégories)','banque','w',0);", + "insert into ".MAIN_DB_PREFIX."rights_def values (130,'Tous les droits sur les caisses','banque','a',0);", + "insert into ".MAIN_DB_PREFIX."rights_def values (131,'Lire les caisses liquide','banque','r',1);", + "insert into ".MAIN_DB_PREFIX."rights_def values (131,'Créer, supprimer transactions','banque','r',1);", + "insert into ".MAIN_DB_PREFIX."rights_def values (133,'Configurer les caisses (créer, gérer catégories)','banque','w',0);", ); return $this->_init($sql); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 8d19ee4df8b..40d6186e147 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -236,6 +236,14 @@ if (defined("MAIN_MODULE_COMPTABILITE")) { $conf->compta->enabled=MAIN_MODULE_COMPTABILITE; } +if (defined("MAIN_MODULE_BANQUE")) +{ + $conf->banque->enabled=MAIN_MODULE_BANQUE; +} +if (defined("MAIN_MODULE_CAISSE")) +{ + $conf->caisse->enabled=MAIN_MODULE_CAISSE; +} if (defined("MAIN_MODULE_DON")) { $conf->don->enabled=MAIN_MODULE_DON;