diff --git a/htdocs/about.php b/htdocs/about.php deleted file mode 100644 index 478ff189c4d..00000000000 --- a/htdocs/about.php +++ /dev/null @@ -1,133 +0,0 @@ - - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2010 Laurent Destailleur - * Copyright (C) 2007 Franky Van Liedekerke - * Copyright (C) 2005-2007 Regis Houssin - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - * \file htdocs/about.php - * \brief About Dolibarr File page - * \version $Id$ - */ - -require("./main.inc.php"); - -$langs->load("admin"); - - -/* - * View - */ - -llxHeader(); - - -print_fiche_titre("Dolibarr",'','setup'); - -print $langs->trans("Version").':'; -print '
    '; -print '
  • '.DOL_VERSION.'
    • '; -print '
'; - -print "
\n"; - -print $langs->trans("DolibarrLicense").':'; -print '
    '; -print '
  • GNU/GPL
    • '; -print '
'; - -print "
\n"; - -print $langs->trans("Developpers").':'; -print ''; - -print "
\n"; - -print $langs->trans("OtherInformations").':'; - -print ''; - - -print $langs->trans("HelpCenter"); -print '
    '; -print '
  • '; -//print $langs->trans("SeeWikiPage",'http://wiki.dolibarr.org/index.php/List_of_OpenSource_Software_companies_and_freelancers'); -print ''.$langs->trans("HelpCenter").''; -print '
    • '; -print '
'; - - -print '
'.$langs->trans("MakeADonation").':
'; - -print '
    '; -print '
    - -'; -print ''; -print '
    '; -print '
'; - - -llxFooter('$Date$ - $Revision$'); -?> - - - - - - - - - - diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index f5e904599d7..78157531e59 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -1,6 +1,6 @@ - * Copyright (C) 2007-2008 Laurent Destailleur + * Copyright (C) 2007-2010 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 @@ -20,7 +20,7 @@ /** * \file htdocs/admin/menus/edit.php * \ingroup core - * \brief Edition des menus + * \brief Tool to edit menus * \version $Id$ */ diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index ae0bede402b..f3080615def 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -282,6 +282,8 @@ if (isset($_POST['action']) && preg_match('/upgrade/i',$_POST["action"])) migrate_shipping_delivery2($db,$langs,$conf); migrate_module_menus($db,$langs,$conf); + + migrate_reload_menu($db,$langs,$conf); } // On commit dans tous les cas. @@ -3120,7 +3122,7 @@ function migrate_shipping_delivery2($db,$langs,$conf) } -/* +/** * Migration directory */ function migrate_directories($db,$langs,$conf,$oldname,$newname) @@ -3135,6 +3137,36 @@ function migrate_directories($db,$langs,$conf,$oldname,$newname) } + +/** + * Reload menu if dynamic menus + */ +function migrate_reload_menu($db,$langs,$conf) +{ + dolibarr_install_syslog("upgrade2::migrate_reload_menu"); + + // Define list of menu handlers to initialize + /*$listofmenuhandler=array(); + $listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$main_menu_barretop)]=1; + $listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$main_menufront_barretop)]=1; + $listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$main_menu_barreleft)]=1; + $listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$main_menufront_barreleft)]=1; + foreach ($listofmenuhandler as $key => $val) + { + //print "x".$key; + + // Load sql ini_menu_handler.sql file + $dir = DOL_DOCUMENT_ROOT."/includes/menus/"; + $file='init_menu_'.$key.'.sql'; + if (file_exists($dir.$file)) + { + $result=run_sql($dir.$file,1); + } + }*/ +} + + + /* A faire egalement: Modif statut paye et fk_facture des factures payes completement On recherche facture incorrecte: