diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index 628dceafd12..f5feef4a0f2 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -83,12 +83,7 @@ $help_url = 'EN:Module_Double_Entry_Accounting#Setup'; llxHeader('', $langs->trans("AccountancyArea"), $help_url); -if (!empty($conf->global->INVOICE_USE_SITUATION) && $conf->global->INVOICE_USE_SITUATION == 1) { - print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy'); - - print ''.$langs->trans("SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices")."\n"; - print "
"; -} elseif (isModEnabled('accounting')) { +if (isModEnabled('accounting')) { $step = 0; $resultboxes = FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb) diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index f494dddb082..b1ba563da95 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -176,7 +176,7 @@ if ($elemid && $action == 'addintocategory' && ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer) || ($type == Categorie::TYPE_TICKET && $user->rights->ticket->write) || ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer) || - ($type == Categorie::TYPE_MEMBER && $user->rights->projet->creer) || + ($type == Categorie::TYPE_MEMBER && $user->hasRight('adherent', 'creer')) || ($type == Categorie::TYPE_CONTACT && $user->rights->societe->creer) || ($type == Categorie::TYPE_USER && $user->rights->user->user->creer) || ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer)