diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index f605f504539..7c99ca35d1e 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -83,7 +83,7 @@ $step++;
print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescMisc", $step, ''.$langs->transnoentitiesnoconv("Financial").'-'.$langs->transnoentitiesnoconv("Accountancy")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'')."
\n";
print "
\n";
$step++;
-$textlink = ''.$langs->transnoentitiesnoconv("Home").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("Dictionaries")."-".$langs->transnoentitiesnoconv("DictionaryVAT").'';
+$textlink = ''.$langs->transnoentitiesnoconv("Financial").'-'.$langs->transnoentitiesnoconv("Accountancy").'-'.$langs->transnoentitiesnoconv("MenuVatAccounts").'';
print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink);
print "
\n";
print "
\n";
@@ -94,7 +94,7 @@ print "
\n";
print "
\n";
if (! empty($conf->tax->enabled))
{
- $textlink = ''.$langs->transnoentitiesnoconv("Home").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("Dictionaries")."-".$langs->transnoentitiesnoconv("DictionarySocialContributions").'';
+ $textlink = ''.$langs->transnoentitiesnoconv("Financial").'-'.$langs->transnoentitiesnoconv("Accountancy").'-'.$langs->transnoentitiesnoconv("MenuTaxAccounts").'';
$step++;
print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
print "
\n";
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index c0f8d7251a4..1b03c0a6d3e 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -56,6 +56,7 @@ $id=GETPOST('id','int');
$rowid=GETPOST('rowid','alpha');
$allowed=$user->admin;
+if ($id == 7 && ! empty($user->rights->accounting->chartofaccount)) $allowed=1; // Tax page allowed to manager of chart account
if ($id == 10 && ! empty($user->rights->accounting->chartofaccount)) $allowed=1; // Vat page allowed to manager of chart account
if (! $allowed) accessforbidden();
@@ -912,11 +913,17 @@ if ($id)
$linkback=''.$langs->trans("BackToDictionaryList").'';
}
$titlepicto='title_setup';
-if (GETPOST('from') == 'accountancy')
+if ($id == 10 && GETPOST('from') == 'accountancy')
{
$titre=$langs->trans("MenuVatAccounts");
- $titlepicto='title_accountancy';
+ $titlepicto='title_accountancy';
}
+if ($id == 7 && GETPOST('from') == 'accountancy')
+{
+ $titre=$langs->trans("MenuTaxAccounts");
+ $titlepicto='title_accountancy';
+}
+
print load_fiche_titre($titre,$linkback,$titlepicto);
if (empty($id))
@@ -974,6 +981,7 @@ if ($id)
print '