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

Merge pull request #14774 from TobiasSekan/FixWrongVisibilityOfCommercialMainMenu

Browse Source 
FIX wrong visibility of commercial main menu
This commit is contained in:
Laurent Destailleur 2020-09-20 17:21:14 +02:00 committed by GitHub
commit a211e3aa93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/core/menus/standard/eldy.lib.php
View File

@ -223,25 +223,21 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
'submenus' => array(), 'submenus' => array(),
); );
// Commercial // Commercial (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
$tmpentry = array( $tmpentry = array(
'enabled'=>(!empty($conf->propal->enabled) || 'enabled'=>(!empty($conf->propal->enabled)
!empty($conf->commande->enabled) || || !empty($conf->commande->enabled)
!empty($conf->fournisseur->enabled) || || !empty($conf->supplier_proposal->enabled)
!empty($conf->supplier_proposal->enabled) || || !empty($conf->supplier_order->enabled)
!empty($conf->supplier_order->enabled) || || !empty($conf->contrat->enabled)
!empty($conf->contrat->enabled) || || !empty($conf->ficheinter->enabled)
!empty($conf->ficheinter->enabled)
) ? 1 : 0, ) ? 1 : 0,
'perms'=>(!empty($user->rights->propal->lire) || 'perms'=>(!empty($user->rights->propal->lire)
!empty($user->rights->commande->lire) || || !empty($user->rights->commande->lire)
!empty($user->rights->fournisseur->lire) || || !empty($user->rights->supplier_proposal->lire)
!empty($user->rights->supplier_proposal->lire) || || !empty($user->rights->supplier_order->lire)
!empty($user->rights->supplier_order->lire) || || !empty($user->rights->contrat->lire)
!empty($user->rights->contrat->lire) || || !empty($user->rights->ficheinter->lire)
!empty($user->rights->ficheinter->lire) ||
!empty($user->rights->supplier_order->lire) ||
!empty($user->rights->fournisseur->commande->lire)
), ),
'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter' 'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
); );
@ -893,7 +889,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
} }
/* /*
* Menu COMMERCIAL * Menu COMMERCIAL (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
*/ */
if ($mainmenu == 'commercial') if ($mainmenu == 'commercial')
{ {