lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix menu accountancy not visible with module "comptabilite"

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-31 16:05:19 +01:00
parent c1c21846ab
commit e2efeeef9a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/user/class/user.class.php
View File

@ -710,6 +710,7 @@ class User extends CommonObject
global $conf; global $conf;
// For compatibility with bad naming permissions on module // For compatibility with bad naming permissions on module
$moduletomoduletouse = array( $moduletomoduletouse = array(
'compta' => 'comptabilite',
'contract' => 'contrat', 'contract' => 'contrat',
'member' => 'adherent', 'member' => 'adherent',
'mo' => 'mrp', 'mo' => 'mrp',
@ -738,7 +739,8 @@ class User extends CommonObject
$moduleRightsMapping = array( $moduleRightsMapping = array(
'product' => 'produit', // We must check $user->rights->produit... 'product' => 'produit', // We must check $user->rights->produit...
'margin' => 'margins' 'margin' => 'margins',
'comptabilite' => 'compta'
); );
$rightsPath = $module; $rightsPath = $module;
@ -760,8 +762,10 @@ class User extends CommonObject
// In $conf->modules, we have 'accounting', 'product', 'facture', ... // In $conf->modules, we have 'accounting', 'product', 'facture', ...
// In $user->rights, we have 'accounting', 'produit', 'facture', ... // In $user->rights, we have 'accounting', 'produit', 'facture', ...
//var_dump($module); //var_dump($module);
//var_dump($rightsPath);
//var_dump($this->rights->$rightsPath); //var_dump($this->rights->$rightsPath);
//var_dump($conf->modules); //var_dump($conf->modules);
//var_dump($module.' '.isModEnabled($module).' '.$rightsPath.' '.$permlevel1.' '.$permlevel2);
if (!isModEnabled($module)) { if (!isModEnabled($module)) {
return 0; return 0;
} }
@ -778,6 +782,7 @@ class User extends CommonObject
} }
//var_dump($this->rights); //var_dump($this->rights);
//var_dump($rightsPath.' '.$permlevel1.' '.$permlevel2);
if (empty($rightsPath) || empty($this->rights) || empty($this->rights->$rightsPath) || empty($permlevel1)) { if (empty($rightsPath) || empty($this->rights) || empty($this->rights->$rightsPath) || empty($permlevel1)) {
return 0; return 0;
} }