From 7ec13e444b934621b35cc1b2914f9237f102b642 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Oct 2007 18:37:34 +0000 Subject: [PATCH] =?UTF-8?q?Simplifications=20diverses=20des=20fonctionnali?= =?UTF-8?q?t=E9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/admin/ihm.php | 9 - htdocs/admin/menus.php | 11 +- htdocs/index.php | 572 ++++++++++++++++++++--------------------- htdocs/user/home.php | 7 +- 4 files changed, 293 insertions(+), 306 deletions(-) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 5386be19940..2ee3618dcff 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -117,11 +117,6 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') print $html->selectyesno('main_show_bugtrack_link',$conf->global->MAIN_SHOW_BUGTRACK_LINK,1); print ''; - $var=!$var; - print ''.$langs->trans("ShowWorkBoard").''; - print $html->selectyesno('main_show_workboard',$conf->global->MAIN_SHOW_WORKBOARD,1); - print ''; - // Désactiver javascript $var=!$var; print ''.$langs->trans("DisableJavascript").''; @@ -246,10 +241,6 @@ else print ''.$langs->trans("ShowBugTrackLink").''; print yn($conf->global->MAIN_SHOW_BUGTRACK_LINK).""; - $var=!$var; - print ''.$langs->trans("ShowWorkBoard").''; - print yn($conf->global->MAIN_SHOW_WORKBOARD).""; - // Disable javascript $var=!$var; print ''.$langs->trans("DisableJavascript").''; diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 2529e4908d3..906a30e9369 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -79,10 +79,13 @@ $head[$h][1] = $langs->trans("MenuHandlers"); $head[$h][2] = 'handler'; $h++; -$head[$h][0] = DOL_URL_ROOT."/admin/menus/index.php"; -$head[$h][1] = $langs->trans("MenuAdmin"); -$head[$h][2] = 'editor'; -$h++; +if ($conf->global->MAIN_LEVEL_FEATURES >= 1) +{ + $head[$h][0] = DOL_URL_ROOT."/admin/menus/index.php"; + $head[$h][1] = $langs->trans("MenuAdmin"); + $head[$h][2] = 'editor'; + $h++; +} dolibarr_fiche_head($head, 'handler', $langs->trans("Menus")); diff --git a/htdocs/index.php b/htdocs/index.php index 3fff3e5a38e..277b3d4bfbb 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -233,309 +233,305 @@ print ''; /* * Dolibarr Work Board */ +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; -if ($conf->global->MAIN_SHOW_WORKBOARD == 1) +$var=true; +// +// Ne pas inclure de sections sans gestion de permissions +// + +// Nbre actions à faire (en retard) +if (($conf->commercial->enabled || $conf->compta->enabled || $conf->comptaexpert->enabled) && $user->rights->actions->lire) { - print '
'.$langs->trans("DolibarrWorkBoard").''.$langs->trans("Number").''.$langs->trans("Late").'  
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + include_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); + $board=new ActionComm($db); + $board->load_board($user); + $board->warning_delay=$conf->actions->warning_delay/60/60/24; + $board->label=$langs->trans("ActionsToDo"); + + $var=!$var; + print ''; + print ''; + print ''; + print ''; print ''; +print "\n"; +} + +// Nbre commandes clients à honorer +if ($conf->commande->enabled && $user->rights->commande->lire) +{ + include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); + $board=new Commande($db); + $board->load_board($user); + + $var=!$var; + print ''; + print ''; + print ''; + print ''; + print ''; +print "\n"; +} + +// Nbre propales ouvertes (expirées) +if ($conf->propal->enabled && $user->rights->propale->lire) +{ + $langs->load("propal"); - $var=true; - // - // Ne pas inclure de sections sans gestion de permissions - // + include_once(DOL_DOCUMENT_ROOT."/propal.class.php"); + $board=new Propal($db); + $board->load_board($user,"opened"); + + $var=!$var; + print ''; + print ''; + print ''; + print ''; + print ''; +} + +// Nbre propales fermées signées (à facturer) +if ($conf->propal->enabled && $user->rights->propale->lire) +{ + $langs->load("propal"); + + include_once(DOL_DOCUMENT_ROOT."/propal.class.php"); + $board=new Propal($db); + $board->load_board($user,"signed"); + + $var=!$var; + print ''; + print ''; + print ''; + print ''; + print ''; +print "\n"; +} + +// Nbre services à activer (en retard) +if ($conf->contrat->enabled && $user->rights->contrat->lire) +{ + $langs->load("contracts"); + + include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); + $board=new Contrat($db); + $board->load_board($user,"inactives"); + + $var=!$var; + print ''; + print ''; + print ''; + print ''; + print ''; +print "\n"; +} + +// Nbre services actifs (à renouveler) +if ($conf->contrat->enabled && $user->rights->contrat->lire) +{ + $langs->load("contracts"); + + include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); + $board=new Contrat($db); + $board->load_board($user,"expired"); + + $var=!$var; + print ''; + print ''; + print ''; + print ''; + print ''; +print "\n"; +} + +// Nbre factures fournisseurs (à payer) +if ($conf->fournisseur->enabled && $conf->facture->enabled && $user->rights->facture->lire) +{ + $langs->load("bills"); + + include_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php"); + $board=new FactureFournisseur($db); + $board->load_board($user); + + $var=!$var; + print ''; + print ''; + print ''; + print ''; + print ''; +print "\n"; +} + +// Nbre factures clients (à payer) +if ($conf->facture->enabled && $user->rights->facture->lire) +{ + $langs->load("bills"); - // Nbre actions à faire (en retard) - if (($conf->commercial->enabled || $conf->compta->enabled || $conf->comptaexpert->enabled) && $user->rights->actions->lire) - { - include_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); - $board=new ActionComm($db); - $board->load_board($user); - $board->warning_delay=$conf->actions->warning_delay/60/60/24; - $board->label=$langs->trans("ActionsToDo"); + include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); + $board=new Facture($db); + $board->load_board($user); - $var=!$var; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - } + $var=!$var; + print ''; + print ''; + print ''; + print ''; + print ''; +print "\n"; +} - // Nbre commandes clients à honorer - if ($conf->commande->enabled && $user->rights->commande->lire) - { - include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); - $board=new Commande($db); - $board->load_board($user); +// Nbre ecritures à rapprocher +if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id) +{ + $langs->load("banks"); - $var=!$var; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - } + include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); + $board=new Account($db); + $board->load_board($user); - // Nbre propales ouvertes (expirées) - if ($conf->propal->enabled && $user->rights->propale->lire) - { - $langs->load("propal"); - - include_once(DOL_DOCUMENT_ROOT."/propal.class.php"); - $board=new Propal($db); - $board->load_board($user,"opened"); - - $var=!$var; - print ''; - print ''; - print ''; - print ''; - print ''; - } - - // Nbre propales fermées signées (à facturer) - if ($conf->propal->enabled && $user->rights->propale->lire) - { - $langs->load("propal"); - - include_once(DOL_DOCUMENT_ROOT."/propal.class.php"); - $board=new Propal($db); - $board->load_board($user,"signed"); - - $var=!$var; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - } - - // Nbre services à activer (en retard) - if ($conf->contrat->enabled && $user->rights->contrat->lire) - { - $langs->load("contracts"); - - include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); - $board=new Contrat($db); - $board->load_board($user,"inactives"); - - $var=!$var; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - } - - // Nbre services actifs (à renouveler) - if ($conf->contrat->enabled && $user->rights->contrat->lire) - { - $langs->load("contracts"); - - include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); - $board=new Contrat($db); - $board->load_board($user,"expired"); - - $var=!$var; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - } - - // Nbre factures fournisseurs (à payer) - if ($conf->fournisseur->enabled && $conf->facture->enabled && $user->rights->facture->lire) - { - $langs->load("bills"); - - include_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php"); - $board=new FactureFournisseur($db); - $board->load_board($user); - - $var=!$var; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - } - - // Nbre factures clients (à payer) - if ($conf->facture->enabled && $user->rights->facture->lire) - { - $langs->load("bills"); - - include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); - $board=new Facture($db); - $board->load_board($user); - - $var=!$var; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - } + $var=!$var; + print ''; + print ''; + print ''; + print ''; + print ''; +print "\n"; +} // Nbre ecritures à rapprocher - if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id) - { - $langs->load("banks"); +if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id) +{ + $langs->load("banks"); - include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); - $board=new Account($db); - $board->load_board($user); + include_once(DOL_DOCUMENT_ROOT."/compta/paiement/cheque/remisecheque.class.php"); + $board=new RemiseCheque($db); + $board->load_board($user); - $var=!$var; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - } - - // Nbre ecritures à rapprocher - if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id) - { - $langs->load("banks"); - - include_once(DOL_DOCUMENT_ROOT."/compta/paiement/cheque/remisecheque.class.php"); - $board=new RemiseCheque($db); - $board->load_board($user); - - $var=!$var; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - } - - // Nbre adhérent valides (attente cotisation) - if ($conf->adherent->enabled && $user->rights->adherent->lire && ! $user->societe_id) - { - $langs->load("members"); - - include_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); - $board=new Adherent($db); - $board->load_board($user); - - $var=!$var; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - } - - print '
'.$langs->trans("DolibarrWorkBoard").''.$langs->trans("Number").''.$langs->trans("Late").'  
'.img_object($langs->trans("Actions"),"task").''.$board->label.''.$board->nbtodo.''; + print ''; + print $board->nbtodolate; + print ''; + print ' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')'; + print ''; + if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); + else print ' '; + print '
'.img_object($langs->trans("Orders"),"order").''.$langs->trans("OrdersToProcess").''.$board->nbtodo.''; + print ''; + print $board->nbtodolate; + print ''; + print ' (>'.ceil($conf->commande->traitement->warning_delay/60/60/24).' '.$langs->trans("days").')'; + print ''; + if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); + else print ' '; + print '
'.img_object($langs->trans("Propals"),"propal").''.$langs->trans("PropalsToClose").''.$board->nbtodo.''; + print ''; + print $board->nbtodolate; + print ''; + print ' (>'.ceil($conf->propal->cloture->warning_delay/60/60/24).' '.$langs->trans("days").')'; + print ''; + if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); + else print ' '; + print '
'.img_object($langs->trans("Propals"),"propal").''.$langs->trans("PropalsToBill").''.$board->nbtodo.''; + print ''; + print $board->nbtodolate; + print ''; + print ' (>'.ceil($conf->propal->facturation->warning_delay/60/60/24).' '.$langs->trans("days").')'; + print ''; + if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); + else print ' '; + print '
'.img_object($langs->trans("Contract"),"contract").''.$langs->trans("BoardNotActivatedServices").''.$board->nbtodo.''; + print ''; + print $board->nbtodolate; + print ''; + print ' (>'.ceil($conf->contrat->services->inactifs->warning_delay/60/60/24).' '.$langs->trans("days").')'; + print ''; + if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); + else print ' '; + print '
'.img_object($langs->trans("Contract"),"contract").''.$langs->trans("BoardRunningServices").''.$board->nbtodo.''; + print ''; + print $board->nbtodolate; + print ''; + print ' (>'.ceil($conf->contrat->services->expires->warning_delay/60/60/24).' '.$langs->trans("days").')'; + print ''; + if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); + else print ' '; + print '
'.img_object($langs->trans("Bills"),"bill").''.$langs->trans("SupplierBillsToPay").''.$board->nbtodo.''; + print ''; + print $board->nbtodolate; + print ''; + print ' (>'.ceil($conf->facture->fournisseur->warning_delay/60/60/24).' '.$langs->trans("days").')'; + print ''; + if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); + else print ' '; + print '
'.img_object($langs->trans("Actions"),"task").''.$board->label.''.$board->nbtodo.''; - print ''; - print $board->nbtodolate; - print ''; - print ' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')'; - print ''; - if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); - else print ' '; - print '
'.img_object($langs->trans("Bills"),"bill").''.$langs->trans("CustomerBillsUnpayed").''.$board->nbtodo.''; + print ''; + print $board->nbtodolate; + print ''; + print ' (>'.ceil($conf->facture->client->warning_delay/60/60/24).' '.$langs->trans("days").')'; + print ''; + if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); + else print ' '; + print '
'.img_object($langs->trans("Orders"),"order").''.$langs->trans("OrdersToProcess").''.$board->nbtodo.''; - print ''; - print $board->nbtodolate; - print ''; - print ' (>'.ceil($conf->commande->traitement->warning_delay/60/60/24).' '.$langs->trans("days").')'; - print ''; - if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); - else print ' '; - print '
'.img_object($langs->trans("Propals"),"propal").''.$langs->trans("PropalsToClose").''.$board->nbtodo.''; - print ''; - print $board->nbtodolate; - print ''; - print ' (>'.ceil($conf->propal->cloture->warning_delay/60/60/24).' '.$langs->trans("days").')'; - print ''; - if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); - else print ' '; - print '
'.img_object($langs->trans("Propals"),"propal").''.$langs->trans("PropalsToBill").''.$board->nbtodo.''; - print ''; - print $board->nbtodolate; - print ''; - print ' (>'.ceil($conf->propal->facturation->warning_delay/60/60/24).' '.$langs->trans("days").')'; - print ''; - if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); - else print ' '; - print '
'.img_object($langs->trans("Contract"),"contract").''.$langs->trans("BoardNotActivatedServices").''.$board->nbtodo.''; - print ''; - print $board->nbtodolate; - print ''; - print ' (>'.ceil($conf->contrat->services->inactifs->warning_delay/60/60/24).' '.$langs->trans("days").')'; - print ''; - if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); - else print ' '; - print '
'.img_object($langs->trans("Contract"),"contract").''.$langs->trans("BoardRunningServices").''.$board->nbtodo.''; - print ''; - print $board->nbtodolate; - print ''; - print ' (>'.ceil($conf->contrat->services->expires->warning_delay/60/60/24).' '.$langs->trans("days").')'; - print ''; - if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); - else print ' '; - print '
'.img_object($langs->trans("Bills"),"bill").''.$langs->trans("SupplierBillsToPay").''.$board->nbtodo.''; - print ''; - print $board->nbtodolate; - print ''; - print ' (>'.ceil($conf->facture->fournisseur->warning_delay/60/60/24).' '.$langs->trans("days").')'; - print ''; - if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); - else print ' '; - print '
'.img_object($langs->trans("Bills"),"bill").''.$langs->trans("CustomerBillsUnpayed").''.$board->nbtodo.''; - print ''; - print $board->nbtodolate; - print ''; - print ' (>'.ceil($conf->facture->client->warning_delay/60/60/24).' '.$langs->trans("days").')'; - print ''; - if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); - else print ' '; - print '
'.img_object($langs->trans("TransactionsToConciliate"),"payment").''.$langs->trans("TransactionsToConciliate").''.$board->nbtodo.''; + print ''; + print $board->nbtodolate; + print ''; + print ' (>'.ceil($conf->bank->rappro->warning_delay/60/60/24).' '.$langs->trans("days").')'; + print ''; + if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); + else print ' '; + print '
'.img_object($langs->trans("TransactionsToConciliate"),"payment").''.$langs->trans("TransactionsToConciliate").''.$board->nbtodo.''; - print ''; - print $board->nbtodolate; - print ''; - print ' (>'.ceil($conf->bank->rappro->warning_delay/60/60/24).' '.$langs->trans("days").')'; - print ''; - if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); - else print ' '; - print '
'.img_object($langs->trans("BankChecksToReceipt"),"payment").''.$langs->trans("BankChecksToReceipt").''.$board->nbtodo.''; - print ''; - print $board->nbtodolate; - print ''; - print ' (>'.ceil($conf->bank->cheque->warning_delay/60/60/24).' '.$langs->trans("days").')'; - print ''; - if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); - else print ' '; - print '
'.img_object($langs->trans("Members"),"user").''.$langs->trans("Members").''.$board->nbtodo.''; - print ''; - print $board->nbtodolate; - print ''; - print ' (>'.ceil($conf->adherent->cotisation->warning_delay/60/60/24).' '.$langs->trans("days").')'; - print ''; - if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); - else print ' '; - print '
'; + $var=!$var; + print ''.img_object($langs->trans("BankChecksToReceipt"),"payment").''.$langs->trans("BankChecksToReceipt").''; + print ''.$board->nbtodo.''; + print ''; + print ''; + print $board->nbtodolate; + print ''; + print ' (>'.ceil($conf->bank->cheque->warning_delay/60/60/24).' '.$langs->trans("days").')'; + print ''; + print ''; + if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); + else print ' '; + print ''; + print ''; +print "\n"; } +// Nbre adhérent valides (attente cotisation) +if ($conf->adherent->enabled && $user->rights->adherent->lire && ! $user->societe_id) +{ + $langs->load("members"); + + include_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); + $board=new Adherent($db); + $board->load_board($user); + + $var=!$var; + print ''.img_object($langs->trans("Members"),"user").''.$langs->trans("Members").''; + print ''.$board->nbtodo.''; + print ''; + print ''; + print $board->nbtodolate; + print ''; + print ' (>'.ceil($conf->adherent->cotisation->warning_delay/60/60/24).' '.$langs->trans("days").')'; + print ''; + print ''; + if ($board->nbtodolate > 0) print img_picto($langs->trans("Late"),"warning"); + else print ' '; + print ''; + print ''; +print "\n"; +} + +print ''; + print ''; diff --git a/htdocs/user/home.php b/htdocs/user/home.php index eab2e951999..d357571ae27 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2007 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,10 +40,7 @@ $langs->load("users"); llxHeader(); -$lien=""; -if ($user->admin) $lien=''.img_picto($langs->trans("Setup"),"setup").' '.$langs->trans("Setup").''; - -print_fiche_titre($langs->trans("MenuUsersAndGroups"),$lien); +print_fiche_titre($langs->trans("MenuUsersAndGroups")); print '';