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

New: Les fonctions de saisie/consultation des charges sociales et impots sont mis dans un module part nomm 'Taxes et charges sociales'. En effet ces fonctions ne sont pas des fonctions de compta pure mais des fonctions de trsoreries. Ceci afin d'avoir une meilleur indpendance du module compta.

Browse Source
This commit is contained in:
Laurent Destailleur 2006-07-23 10:29:53 +00:00
parent d94dc96e22
commit 4c98a91d34
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/compta/commande/pre.inc.php
View File

@ -102,12 +102,12 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/compta/deplacement/", "Déplacement");
}
if (($conf->compta->enabled || $conf->comptaexpert->enabled) && $conf->compta->tva && $user->societe_id == 0)
if ($conf->tax->enabled && $conf->compta->tva && $user->societe_id == 0)
{
$menu->add(DOL_URL_ROOT."/compta/tva/index.php",$langs->trans("VAT"));
}
if ($conf->compta->enabled || $conf->comptaexpert->enabled)
if ($conf->tax->enabled)
{
$menu->add(DOL_URL_ROOT."/compta/charges/index.php",$langs->trans("Charges"));
}
@ -127,12 +127,18 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrders"));
}
$menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
if ($user->rights->compta->ventilation->parametrer)
if ($conf->compta->enabled)
{
$menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param"));
}
if ($user->rights->compta->ventilation->creer)
{
$menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
}
if ($user->rights->compta->ventilation->parametrer)
{
$menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param"));
}
}
left_menu($menu->liste, $help_url);

21
htdocs/compta/pre.inc.php
View File

@ -99,12 +99,12 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/compta/deplacement/", $langs->trans("Trips"));
}
if (($conf->compta->enabled || $conf->comptaexpert->enabled) && $conf->compta->tva && $user->societe_id == 0)
if ($conf->tax->enabled && $conf->compta->tva && $user->societe_id == 0)
{
$menu->add(DOL_URL_ROOT."/compta/tva/index.php",$langs->trans("VAT"));
}
if ($conf->compta->enabled || $conf->comptaexpert->enabled)
if ($conf->tax->enabled)
{
$menu->add(DOL_URL_ROOT."/compta/charges/index.php",$langs->trans("Charges"));
}
@ -124,13 +124,18 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/compta/prelevement/",$langs->trans("StandingOrders"));
}
$menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
if ($user->rights->compta->ventilation->parametrer)
if ($conf->compta->enabled)
{
$menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param"));
}
if ($user->rights->compta->ventilation->parametrer)
{
$menu->add(DOL_URL_ROOT."/compta/ventilation/",$langs->trans("Ventilation"));
}
if ($user->rights->compta->ventilation->parametrer)
{
$menu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Param"));
}
}
left_menu($menu->liste, $help_url);
}