diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php index d58d3271bdf..442e01b56f6 100644 --- a/htdocs/core/modules/modPartnership.class.php +++ b/htdocs/core/modules/modPartnership.class.php @@ -179,11 +179,10 @@ class modPartnership extends DolibarrModules $tabtoadd = ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') ? 'member' : 'thirdparty'; - if($tabtoadd == 'member'){ + if ($tabtoadd == 'member') { $this->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__'); $fk_mainmenu = "members"; - } - else{ + } else { $this->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__'); $fk_mainmenu = "companies"; } diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php index 204201d51c2..d55daab2347 100644 --- a/htdocs/partnership/admin/setup.php +++ b/htdocs/partnership/admin/setup.php @@ -85,16 +85,15 @@ if ($action == 'setting') { $value = GETPOST('managed_for', 'alpha'); - + $modulemenu = ($value == 'member') ? 'member' : 'thirdparty'; $res = dolibarr_set_const($db, "PARTNERSHIP_IS_MANAGED_FOR", $modulemenu, 'chaine', 0, '', $conf->entity); $partnership->tabs = array(); - if($modulemenu == 'member'){ + if ($modulemenu == 'member') { $partnership->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__'); $fk_mainmenu = "members"; - } - else{ + } else { $partnership->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__'); $fk_mainmenu = "companies"; } @@ -102,10 +101,9 @@ if ($action == 'setting') { foreach ($partnership->menu as $key => $menu) { $partnership->menu[$key]['mainmenu'] = $fk_mainmenu; - if($menu['leftmenu'] == 'partnership') + if ($menu['leftmenu'] == 'partnership') $partnership->menu[$key]['fk_menu'] = 'fk_mainmenu='.$fk_mainmenu; - else - $partnership->menu[$key]['fk_menu'] = 'fk_mainmenu='.$fk_mainmenu.',fk_leftmenu=partnership'; + else $partnership->menu[$key]['fk_menu'] = 'fk_mainmenu='.$fk_mainmenu.',fk_leftmenu=partnership'; } $error += $partnership->delete_tabs(); @@ -113,7 +111,6 @@ if ($action == 'setting') { $error += $partnership->delete_menus(); $error += $partnership->insert_menus(); - } if ($action) {