Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

2015-04-19 23:15:39 +02:00 · 2015-04-19 23:15:39 +02:00 · 94589b9935
commit 94589b9935
parent 65dafeee55 560fcb1b24
358 changed files with 17735 additions and 17053 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -8,14 +8,10 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 [*.php]
-indent_style = space
-indent_size = 4
+indent_style = tab
 [*.js]
-indent_style = space
-indent_size = 2
+indent_style = tab
 [*.css]
-indent_style = space
-indent_size = 2
+indent_style = tab
 [*.xml]
-indent_style = space
-indent_size = 4
+indent_style = tab
--- a/.travis.yml
+++ b/.travis.yml
@ -90,6 +90,7 @@ before_script:
 - echo Install apache server
 - sudo apt-get update
 - sudo apt-get install -y --force-yes apache2 libapache2-mod-php5 php5-curl php5-mysql php5-pgsql php5-intl
+ - sudo apt-get install mysql-server-5.6 mysql-client-5.6
 - sudo sed -i -e "s,/var/www,$(pwd)/htdocs,g" /etc/apache2/sites-available/default
 - echo Show default virtual host
 - sudo cat /etc/apache2/sites-available/default
@ -111,8 +112,9 @@ script:
 - php upgrade.php 3.6.0 3.7.0 ignoredbversion > upgrade360370.log
 - php upgrade2.php 3.6.0 3.7.0 ignoredbversion > upgrade360370-2.log
 - php upgrade.php 3.7.0 3.8.0 ignoredbversion > upgrade370380.log
+ - cat upgrade370380.log
 - php upgrade2.php 3.7.0 3.8.0 ignoredbversion > upgrade370380-2.log
-# - cat upgrade370380-2.log
+ - cat upgrade370380-2.log
 - cd ../..
 - date
 - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php
--- a/1
+++ b/1
@ -18,6 +18,7 @@ CKEditor               4.3.3         LGPL-2.1+                   Yes
 FPDI                   1.5.2         Apache Software License 2.0 Yes             PDF templates management
 GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
+PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
 odtPHP                 1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
 PHPExcel               1.8.0         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 php-iban               1.4.6         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
--- a/dev/initdata/mysqldump_dolibarr_3.5.0.sql
+++ b/dev/initdata/mysqldump_dolibarr_3.5.0.sql
--- a/dev/translation/sanity_check_en_langfiles.php
+++ b/dev/translation/sanity_check_en_langfiles.php
@ -0,0 +1,221 @@
+<?php
+/* Copyright (c) 2015 Tommaso Basilici <t.basilici@19.coop>
+*
+* 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, see <http://www.gnu.org/licenses/>.
+*/
+
+echo "<html>";
+echo "<head>";
+
+echo "<STYLE type=\"text/css\"> 
+body {
+	color: #444;
+	font: 100%/30px 'Helvetica Neue', helvetica, arial, sans-serif;
+	text-shadow: 0 1px 0 #fff;
+}
+
+strong {
+	font-weight: bold; 
+}
+
+em {
+	font-style: italic; 
+}
+
+table {
+	background: #f5f5f5;
+	border-collapse: separate;
+	box-shadow: inset 0 1px 0 #fff;
+	font-size: 12px;
+	line-height: 24px;
+	margin: 30px auto;
+	text-align: left;
+	width: 800px;
+}	
+
+th {
+	background-color: #777;
+	border-left: 1px solid #555;
+	border-right: 1px solid #777;
+	border-top: 1px solid #555;
+	border-bottom: 1px solid #333;
+	box-shadow: inset 0 1px 0 #999;
+	color: #fff;
+  font-weight: bold;
+	padding: 10px 15px;
+	position: relative;
+	text-shadow: 0 1px 0 #000;	
+}
+
+th:after {
+	background: linear-gradient(rgba(255,255,255,0), rgba(255,255,255,.08));
+	content: '';
+	display: block;
+	height: 25%;
+	left: 0;
+	margin: 1px 0 0 0;
+	position: absolute;
+	top: 25%;
+	width: 100%;
+}
+
+th:first-child {
+	border-left: 1px solid #777;	
+	box-shadow: inset 1px 1px 0 #999;
+}
+
+th:last-child {
+	box-shadow: inset -1px 1px 0 #999;
+}
+
+td {
+	border-right: 1px solid #fff;
+	border-left: 1px solid #e8e8e8;
+	border-top: 1px solid #fff;
+	border-bottom: 1px solid #e8e8e8;
+	padding: 10px 15px;
+	position: relative;
+	transition: all 300ms;
+}
+
+td:first-child {
+	box-shadow: inset 1px 0 0 #fff;
+}	
+
+td:last-child {
+	border-right: 1px solid #e8e8e8;
+	box-shadow: inset -1px 0 0 #fff;
+}	
+
+tr {
+	background-color: #f1f1f1;
+
+}
+
+tr:nth-child(odd) td {
+	background-color: #f1f1f1;	
+}
+
+tr:last-of-type td {
+	box-shadow: inset 0 -1px 0 #fff; 
+}
+
+tr:last-of-type td:first-child {
+	box-shadow: inset 1px -1px 0 #fff;
+}	
+
+tr:last-of-type td:last-child {
+	box-shadow: inset -1px -1px 0 #fff;
+}	
+
+tbody:hover td {
+	color: transparent;
+	text-shadow: 0 0 3px #aaa;
+}
+
+tbody:hover tr:hover td {
+	color: #444;
+	text-shadow: 0 1px 0 #fff;
+} </STYLE>";
+
+echo "<body>";
+echo "<h3>If you call this file with the argument \"?unused=true\" it searches for the translation strings that exist in en_US but are never used</h3>";
+echo "<h2>IMPORTANT: that can take quite a lot of time (up to 10 minutes), you need to tune the max_execution_time on your php.ini accordingly</h2>";
+echo "<h3>Happy translating :)</h3>";
+
+// directory containing the php and lang files 
+$htdocs 	= "../../htdocs/"; 
+// directory containing the english lang files
+$workdir 	= $htdocs."langs/en_US/";
+
+$files = scandir($workdir);
+$exludefiles = array('.','..','README');
+$files = array_diff($files,$exludefiles);
+$langstrings_3d = array();
+$langstrings_full = array();
+foreach ($files AS $file) {
+	$path_file = pathinfo($file);
+	// we're only interested in .lang files
+	if ($path_file['extension']=='lang') {
+		$content = file($workdir.$file);
+		foreach ($content AS $line => $row) {
+			// don't want comment lines
+			if (substr($row,0,1) !== '#') {
+				// don't want lines without the separator (why should those even be here, anyway...)
+				if (strpos($row,'=')!==false) {
+					$row_array = explode('=',$row);
+					$langstrings_3d[$path_file['basename']][$line+1]=$row_array[0];
+					$langstrings_full[]=$row_array[0];
+					$langstrings_dist[$row_array[0]]=$row_array[0];
+				}				
+			}
+		}
+	}
+}
+
+foreach ($langstrings_3d AS $filename => $file) {
+	foreach ($file AS $linenum => $value) {
+		$keys = array_keys($langstrings_full, $value);
+		if (count($keys)>1) {
+				foreach ($keys AS $key) {
+					$dups[$value][$filename][$linenum] = '';
+				}
+		}
+	}
+}
+
+echo "<h2>Duplicate strings in lang files in $workdir - ".count($dups)." found</h2>";
+echo "<pre>";
+
+echo "<table border_bottom=1> ";
+echo "<thead><tr><th align=\"center\">#</th><th>String</th><th>File and lines</th></thead>";
+echo "<tbody>";
+$count = 0;
+foreach ($dups as $string => $pages) {
+	$count++;
+	echo "<tr>";
+	echo "<td align=\"center\">$count</td>";
+	echo "<td>$string</td>";
+	echo "<td>";
+	foreach ($pages AS $page => $lines ) {
+		echo "$page ";
+		foreach ($lines as $line => $nothing) {
+			echo "($line) ";
+		}
+		echo "<br>";
+	}
+	echo "</td></tr>";
+}
+echo "</tbody>";
+echo "</table>";
+
+
+if ($_REQUEST['unused'] == 'true') {
+
+	foreach ($langstrings_dist AS $value){
+		$search = '\'trans("'.$value.'")\'';
+		$string =  'grep -R -m 1 -F --include=*.php '.$search.' '.$htdocs.'*';
+		exec($string,$output);
+		if (empty($output)) {
+			$unused[$value] = true;
+			echo $value.'<br>';
+		}
+	}
+
+	echo "<h2>Strings in en_US that are never used</h2>";
+	echo "<pre>";
+	print_r($unused);
+}
+echo "</body>";
+echo "</html>";
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@ -4,6 +4,7 @@
 * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
 * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
 * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -94,7 +95,7 @@ llxHeader();
 $form = new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'setup');
+print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');

 $head = admin_accounting_prepare_head();

--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@ -5,6 +5,7 @@
 * Copyright (C) 2014      Ari Elbaz (elarifr)	<github@accedinfo.com>
 * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
 * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -148,7 +149,7 @@ llxHeader();
 $form = new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'setup');
+print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');

 $head = admin_accounting_prepare_head($accounting);

--- a/htdocs/accountancy/admin/journaux.php
+++ b/htdocs/accountancy/admin/journaux.php
@ -4,6 +4,7 @@
 * Copyright (C) 2014 	   Florian Henry		<florian.henry@open-concept.pro>
 * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
 * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -82,7 +83,7 @@ llxHeader();
 $form = new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'setup');
+print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');

 $head = admin_accounting_prepare_head(null);

--- a/htdocs/accountancy/bookkeeping/balancebymonth.php
+++ b/htdocs/accountancy/bookkeeping/balancebymonth.php
@ -2,6 +2,7 @@
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
 * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
 * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2015	Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@ -106,7 +106,7 @@ if (! empty($id)) {
 			print '<input type="hidden" name="action" value="ventil">';

 			$linkback='<a href="'.DOL_URL_ROOT.'/accountancy/customer/lines.php">'.$langs->trans("Back").'</a>';
-			print_fiche_titre($langs->trans('CustomersVentilation'),$linkback,'setup');
+			print_fiche_titre($langs->trans('CustomersVentilation'),$linkback,'title_setup');

 			print '<table class="border" width="100%">';

--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@ -3,6 +3,7 @@
 * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
 * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
 * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@ -5,6 +5,7 @@
 * Copyright (C) 2013-2014  Olivier Geffroy       <jeff@jeffinfo.com>
 * Copyright (C) 2013-2014	Florian Henry	      <florian.henry@open-concept.pro>
 * Copyright (C) 2014	    Juanjo Menent		  <jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@ -7,6 +7,7 @@
 * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2011-2012 Juanjo Menent		<jmenent@2byte.es>
 * Copyright (C) 2012      J. Fernando Lagrange <fernando@demo-tic.org>
+ * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -110,7 +111,7 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url);


 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');


 $head = member_admin_prepare_head();
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@ -65,12 +65,12 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url);


 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');


 $head = member_admin_prepare_head();

-dol_fiche_head($head, 'attributes', $langs->trans("Members"), 0, 'user');
+dol_fiche_head($head, 'attributes', $langs->trans("Members"), 0, 'title_user');

 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';

--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@ -4,6 +4,7 @@
 * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
 * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
 * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -67,7 +68,7 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url);


 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup_title');


 $head = member_admin_prepare_head();
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@ -3,6 +3,7 @@
 * Copyright (C) 2006-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
 * Copyright (C) 2006-2012	Regis Houssin			<regis.houssin@capnetworks.com>
 * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -80,7 +81,7 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url);


 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MembersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');

 $head = member_admin_prepare_head();

@ -164,7 +165,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr '.$bc[$var].' id="tramount"><td>';
 print $langs->trans("DefaultAmount");
 print '</td><td align="right">';
-print '<input type="text" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT" size="5" value="'.(! empty($conf->global->MEMBER_NEWFORM_AMOUNT)?$conf->global->MEMBER_NEWFORM_AMOUNT:'').'">';;
+print '<input type="text" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT" size="5" value="'.(! empty($conf->global->MEMBER_NEWFORM_AMOUNT)?$conf->global->MEMBER_NEWFORM_AMOUNT:'').'">';
 print "</td></tr>\n";

 // Can edit
@ -197,7 +198,7 @@ if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
    print '<tr '.$bc[$var].' id="tremail"><td>';
    print $langs->trans("MEMBER_PAYONLINE_SENDEMAIL");
    print '</td><td align="right">';
-	print '<input type="text" id="MEMBER_PAYONLINE_SENDEMAIL" name="MEMBER_PAYONLINE_SENDEMAIL" size="24" value="'.(! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL)?$conf->global->MEMBER_PAYONLINE_SENDEMAIL:'').'">';;
+	print '<input type="text" id="MEMBER_PAYONLINE_SENDEMAIL" name="MEMBER_PAYONLINE_SENDEMAIL" size="24" value="'.(! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL)?$conf->global->MEMBER_PAYONLINE_SENDEMAIL:'').'">';
    print "</td></tr>\n";
 }

--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@ -249,7 +249,7 @@ if (empty($reshook))
 		}
 		$lastname=$_POST["lastname"];
 		$firstname=$_POST["firstname"];
-		$morphy=$morphy=$_POST["morphy"];;
+		$morphy=$morphy=$_POST["morphy"];
 		if ($morphy != 'mor' && empty($lastname)) {
 			$error++;
 			$langs->load("errors");
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@ -1954,4 +1954,21 @@ class Adherent extends CommonObject
        }
    }

+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty($db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'adherent'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
+
 }
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@ -2,6 +2,7 @@
 /* Copyright (C) 2008-2014	Laurent Destailleur <eldy@users.sourceforge.net>
 * Copyright (C) 2011		Regis Houssin		<regis.houssin@capnetworks.com>
 * Copyright (C) 2011-2012  Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -132,7 +133,7 @@ if (preg_match('/del_(.*)/',$action,$reg))
 llxHeader();

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print "<br>\n";


--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@ -4,6 +4,7 @@
 * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
 * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
 * Copyright (C) 2012		Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -69,7 +70,7 @@ $textobject=$langs->transnoentitiesnoconv("Agenda");
 llxHeader('',$langs->trans("AgendaSetup"));

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print "<br>\n";

 $head=agenda_prepare_head();
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2011-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -123,7 +124,7 @@ $arrayofcss=array();
 llxHeader('',$langs->trans("AgendaSetup"),'','',0,0,$arrayofjs,$arrayofcss);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print '<br>';

 $head=agenda_prepare_head();
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2008-2010	Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2011		Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2013  Juanjo Menent		<jmenent@2byte.es>
+/* Copyright (C) 2008-2010	Laurent Destailleur             <eldy@users.sourceforge.net>
+ * Copyright (C) 2011		Regis Houssin                   <regis.houssin@capnetworks.com>
+ * Copyright (C) 2011-2013      Juanjo Menent                   <jmenent@2byte.es>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -88,7 +89,7 @@ $formactions=new FormActions($db);
 llxHeader();

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print "<br>\n";


--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@ -2,6 +2,7 @@
 /* Copyright (C) 2008-2013 	Laurent Destailleur <eldy@users.sourceforge.net>
 * Copyright (C) 2012-2013	Juanjo Menent		<jmenent@2byte.es>
 * Copyright (C) 2012		Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2015		Jean-François Ferry	<jfefe@aternatik.fr>
 *
 * 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
@ -73,7 +74,7 @@ if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_A
 llxHeader();

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
 print '<br>';


--- a/htdocs/admin/askpricesupplier.php
+++ b/htdocs/admin/askpricesupplier.php
@ -6,7 +6,8 @@
 * Copyright (C) 2004      Eric Seigne                 <eric.seigne@ryxeo.com>
 * Copyright (C) 2005-2012 Regis Houssin               <regis.houssin@capnetworks.com>
 * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2011-2013 Juanjo Menent			   <jmenent@2byte.es>
+ * Copyright (C) 2011-2013 Juanjo Menent                <jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -239,7 +240,7 @@ $form=new Form($db);
 //if ($mesg) print $mesg;

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');

 $head = askpricesupplier_admin_prepare_head();

--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2009 		Laurent Destailleur            <eldy@users.sourceforge.net>
- * Copyright (C) 2010-2013  Juanjo Menent			       <jmenent@2byte.es>
- * Copyright (C) 2013-2014  Philippe Grand                 <philippe.grand@atoo-net.com>
+/* Copyright (C) 2009       Laurent Destailleur        <eldy@users.sourceforge.net>
+ * Copyright (C) 2010-2013  Juanjo Menent	       <jmenent@2byte.es>
+ * Copyright (C) 2013-2014  Philippe Grand             <philippe.grand@atoo-net.com>
+ * Copyright (C) 2015       Jean-François Ferry         <jfefe@aternatik.fr>
 *
 * 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
@ -86,7 +87,7 @@ llxHeader("",$langs->trans("BankSetupModule"));
 $form=new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup');
+print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup');


 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
--- a/htdocs/admin/bank_extrafields.php
+++ b/htdocs/admin/bank_extrafields.php
@ -4,6 +4,7 @@
 * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
 * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
 * Copyright (C) 2014		Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -65,7 +66,7 @@ llxHeader('',$langs->trans("BankSetupModule"),$help_url);


 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup');
+print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup');


 $head = bank_admin_prepare_head(null);
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@ -130,7 +130,7 @@ $help_url='EN:Module_Barcode|FR:Module_Codes_Barre|ES:Módulo Código de barra';
 llxHeader('',$langs->trans("BarcodeSetup"),$help_url);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("BarcodeSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("BarcodeSetup"),$linkback,'title_setup');

 // Detect bar codes modules
 $barcodelist=array();
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -218,7 +219,7 @@ $form=new Form($db);

 llxHeader('',$langs->trans("Boxes"));

-print_fiche_titre($langs->trans("Boxes"),'','setup');
+print_fiche_titre($langs->trans("Boxes"),'','title_setup');

 print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";

--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@ -60,7 +60,7 @@ $wikihelp='EN:Module_ClickToDial_En|FR:Module_ClickToDial|ES:Módulo_ClickTodial
 llxHeader('',$langs->trans("ClickToDialSetup"),$wikihelp);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ClickToDialSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("ClickToDialSetup"),$linkback,'title_setup');

 print $langs->trans("ClickToDialDesc")."<br>\n";

--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@ -263,7 +263,7 @@ llxHeader("",$langs->trans("OrdersSetup"));
 $form=new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
 print '<br>';

 $head = order_admin_prepare_head();
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@ -275,7 +275,7 @@ $formcompany=new FormCompany($db);

 $countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';

-print_fiche_titre($langs->trans("CompanyFoundation"),'','setup');
+print_fiche_titre($langs->trans("CompanyFoundation"),'','title_setup');

 print $langs->trans("CompanyFundationDesc")."<br>\n";
 print "<br>\n";
@ -369,7 +369,7 @@ if ($action == 'edit' || $action == 'updateedit')
    // Logo
    $var=!$var;
    print '<tr'.dol_bc($var,'hideonsmartphone').'><td><label for="logo">'.$langs->trans("Logo").' (png,jpg)</label></td><td>';
-    print '<table width="100%" class="nocellnopadd"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
+    print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
    print '<input type="file" class="flat" name="logo" id="logo" size="50">';
    print '</td><td valign="middle" align="right">';
    if (! empty($mysoc->logo_mini))
@ -754,7 +754,7 @@ else
    $var=!$var;
    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Logo").'</td><td>';

-    print '<table width="100%" class="nocellnopadd"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
+    print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
    print $mysoc->logo;
    print '</td><td valign="center" align="right">';

--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@ -104,7 +104,7 @@ llxHeader();
 $form=new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'setup');
+print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'title_setup');

 print '<br>';

--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@ -74,7 +74,7 @@ $form=new Form($db);
 llxHeader("","");

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
 print '<br>';

 $h = 0;
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@ -172,7 +172,7 @@ jQuery(document).ready(function() {
 <?php
 }

-print_fiche_titre($langs->trans("OtherSetup"),'','setup');
+print_fiche_titre($langs->trans("OtherSetup"),'','title_setup');

 print $langs->trans("ConstDesc")."<br>\n";
 print "<br>\n";
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@ -214,7 +214,7 @@ llxHeader();
 $form=new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');

 print "<br>";

--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@ -127,7 +127,7 @@ $form = new Form($db);

 llxHeader();

-print_fiche_titre($langs->trans("DelaysOfToleranceBeforeWarning"),'','setup');
+print_fiche_titre($langs->trans("DelaysOfToleranceBeforeWarning"),'','title_setup');

 print $langs->transnoentities("DelaysOfToleranceDesc",img_warning());
 print " ".$langs->trans("OnlyActiveElementsAreShown",DOL_URL_ROOT.'/admin/modules.php')."<br>\n";
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@ -748,7 +748,7 @@ if ($id)
    $titre.=' - '.$langs->trans($tablib[$id]);
    $linkback='<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
 }
-print_fiche_titre($titre,$linkback,'setup');
+print_fiche_titre($titre,$linkback,'title_setup');

 if (empty($id))
 {
@ -913,7 +913,7 @@ if ($id)
        print "</tr>";

        $colspan=count($fieldlist)+2;
-        if ($id == 4) $colspan++;;
+        if ($id == 4) $colspan++;

        if (! empty($alabelisused))  // Si un des champs est un libelle
        {
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@ -69,7 +69,7 @@ $help_url='';
 llxHeader('',$langs->trans("ECMSetup"),$help_url);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ECMSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("ECMSetup"),$linkback,'title_setup');
 print '<br>';

 print '<table class="noborder" width="100%">';
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@ -73,7 +73,7 @@ if ($action == "save")
 llxHeader('',$langs->trans("Audit"));

 //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
+print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');

 print $langs->trans("LogEventDesc")."<br>\n";
 print "<br>\n";
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@ -217,7 +217,7 @@ $form=new Form($db);
 llxHeader("","");

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
 print '<br>';


--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@ -231,7 +231,7 @@ llxHeader();
 $form=new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_setup');


 $head=expensereport_admin_prepare_head();
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@ -189,7 +189,7 @@ if ($_POST["delete"])
 llxHeader('',$langs->trans("ExternalRSSSetup"));

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ExternalRSSSetup"), $linkback, 'setup');
+print_fiche_titre($langs->trans("ExternalRSSSetup"), $linkback, 'title_setup');
 print '<br>';

 // Formulaire ajout
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@ -293,7 +293,7 @@ $form=new Form($db);


 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
 print '<br>';

 $head = invoice_admin_prepare_head();
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@ -112,7 +112,7 @@ if (GETPOST('save','alpha'))
 llxHeader();

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AdvancedEditor"),$linkback,'setup');
+print_fiche_titre($langs->trans("AdvancedEditor"),$linkback,'title_setup');
 print '<br>';

 $var=true;
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@ -247,7 +247,7 @@ llxHeader();
 $form=new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup');


 $head=fichinter_admin_prepare_head();
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@ -76,7 +76,7 @@ $form=new Form($db);
 llxHeader();

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("GeoIPMaxmindSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("GeoIPMaxmindSetup"),$linkback,'title_setup');
 print '<br>';

 $version='';
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@ -101,7 +101,7 @@ $form=new Form($db);
 $formother=new FormOther($db);
 $formadmin=new FormAdmin($db);

-print_fiche_titre($langs->trans("GUISetup"),'','setup');
+print_fiche_titre($langs->trans("GUISetup"),'','title_setup');

 print $langs->trans("DisplayDesc")."<br>\n";
 print "<br>\n";
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -42,7 +43,7 @@ llxHeader('',$langs->trans("Setup"),$wikihelp);
 $form = new Form($db);


-print_fiche_titre($langs->trans("SetupArea"),'','setup');
+print_fiche_titre($langs->trans("SetupArea"),'','title_setup.png');


 if (! empty($conf->global->MAIN_MOTD_SETUPPAGE))
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@ -82,7 +82,7 @@ llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:M&o

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';

-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');

 $head = ldap_prepare_head();

--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@ -95,7 +95,7 @@ if ($action == 'setvalue' && $user->admin)
 llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:M&oacute;dulo_LDAP');
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';

-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');

 $head = ldap_prepare_head();

--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@ -86,7 +86,7 @@ if ($action == 'setvalue' && $user->admin)
 llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:M&oacute;dulo_LDAP');
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';

-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');

 $head = ldap_prepare_head();

--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@ -110,7 +110,7 @@ if ($action == 'setvalue' && $user->admin)
 llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:M&oacute;dulo_LDAP');
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';

-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');

 $head = ldap_prepare_head();

--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@ -96,7 +96,7 @@ if ($action == 'setvalue' && $user->admin)
 llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:M&oacute;dulo_LDAP');
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';

-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');

 $head = ldap_prepare_head();

--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@ -88,7 +88,7 @@ $form=new Form($db);

 llxHeader();

-print_fiche_titre($langs->trans("LimitsSetup"),'','setup');
+print_fiche_titre($langs->trans("LimitsSetup"),'','title_setup');


 print $langs->trans("LimitsDesc")."<br>\n";
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@ -208,7 +208,7 @@ llxHeader("","");
 $form=new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
 print '<br>';


--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@ -78,7 +78,7 @@ llxHeader();
 $form = new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('ConfigLoan'),$linkback,'setup');
+print_fiche_titre($langs->trans('ConfigLoan'),$linkback,'title_setup');

 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@ -81,7 +81,7 @@ if ($action == 'setvalue')
 llxHeader('',$langs->trans("MailingSetup"));

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MailingSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MailingSetup"),$linkback,'title_setup');

 if (! empty($conf->use_javascript_ajax))
 {
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@ -152,7 +152,7 @@ llxHeader('',$langs->trans("MailmanSpipSetup"),$help_url);


 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup');

 $head = mailmanspip_admin_prepare_head();

--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@ -245,7 +245,7 @@ if (! $server) $server='127.0.0.1';
 $wikihelp='EN:Setup EMails|FR:Paramétrage EMails|ES:Configuración EMails';
 llxHeader('',$langs->trans("Setup"),$wikihelp);

-print_fiche_titre($langs->trans("EMailsSetup"),'','setup');
+print_fiche_titre($langs->trans("EMailsSetup"),'','title_setup');

 print $langs->trans("EMailsDesc")."<br>\n";
 print "<br>\n";
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@ -131,7 +131,7 @@ $formadmin=new FormAdmin($db);
 $wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
 llxHeader('',$langs->trans("Setup"),$wikihelp);

-print_fiche_titre($langs->trans("Menus"),'','setup');
+print_fiche_titre($langs->trans("Menus"),'','title_setup');


 $h = 0;
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@ -270,7 +270,7 @@ if ($action == 'create')
    });
    </script>';

-    print_fiche_titre($langs->trans("NewMenu"),'','setup');
+    print_fiche_titre($langs->trans("NewMenu"),'','title_setup');

    print '<form action="./edit.php?action=add&menuId='.$_GET['menuId'].'" method="post" name="formmenucreate">';
    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -379,7 +379,7 @@ if ($action == 'create')
 }
 elseif ($action == 'edit')
 {
-    print_fiche_titre($langs->trans("ModifMenu"),'','setup');
+    print_fiche_titre($langs->trans("ModifMenu"),'','title_setup');
    print '<br>';

    print '<form action="./edit.php?action=update" method="POST" name="formmenuedit">';
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@ -214,7 +214,7 @@ $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css')
 llxHeader('',$langs->trans("Menus"),'','',0,0,$arrayofjs,$arrayofcss);


-print_fiche_titre($langs->trans("Menus"),'','setup');
+print_fiche_titre($langs->trans("Menus"),'','title_setup');


 $h = 0;
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@ -71,7 +71,7 @@ else if ($action == 'disable_layoutmenu')

 llxHeader('',$langs->trans("Setup"));

-print_fiche_titre($langs->trans("Menus"),'','setup');
+print_fiche_titre($langs->trans("Menus"),'','title_setup');


 $h = 0;
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@ -5,6 +5,7 @@
 * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
 * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
 * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
 *
 * 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
@ -210,7 +211,7 @@ asort($orders);
 $nbofactivatedmodules=count($conf->modules);
 $moreinfo=$langs->trans("TotalNumberOfActivatedModules",($nbofactivatedmodules-1));
 if ($nbofactivatedmodules <= 1) $moreinfo .= ' '.img_warning($langs->trans("YouMustEnableOneModule"));
-print load_fiche_titre($langs->trans("ModulesSetup"),$moreinfo,'setup');
+print load_fiche_titre($langs->trans("ModulesSetup"),$moreinfo,'title_setup');

 // Start to show page
 if (empty($mode)) $mode='common';
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@ -115,7 +115,7 @@ $notify = new Notify($db);
 llxHeader('',$langs->trans("NotificationSetup"));

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("NotificationSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("NotificationSetup"),$linkback,'title_setup');

 print $langs->trans("NotificationsDesc").'<br><br>';

--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@ -70,7 +70,7 @@ $textobject=$langs->transnoentitiesnoconv("Orders");
 llxHeader('',$langs->trans("OrdersSetup"));

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
 print "<br>\n";

 $head = order_admin_prepare_head();
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@ -71,7 +71,7 @@ $textobject=$langs->transnoentitiesnoconv("OrderLines");
 llxHeader('',$langs->trans("OrdersSetup"));

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
 print "<br>\n";

 $head = order_admin_prepare_head();
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@ -93,7 +93,7 @@ $form=new Form($db);
 $formother=new FormOther($db);
 $formadmin=new FormAdmin($db);

-print_fiche_titre($langs->trans("PDF"),'','setup');
+print_fiche_titre($langs->trans("PDF"),'','title_setup');

 print $langs->trans("PDFDesc")."<br>\n";
 print "<br>\n";
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@ -64,7 +64,7 @@ if ($action == 'remove')

 llxHeader('',$langs->trans("DefaultRights"));

-print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
+print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');

 print $langs->trans("DefaultRightsDesc");
 print " ".$langs->trans("OnlyActiveElementsAreShown")."<br><br>\n";
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@ -119,7 +119,7 @@ llxHeader('',$langs->trans("WithdrawalsSetup"));

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';

-print_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'title_setup');
 print '<br>';

 print '<form method="post" action="prelevement.php?action=set">';
@ -180,7 +180,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
    $langs->load("mails");
    print_titre($langs->trans("Notifications"));

-    $sql = "SELECT u.rowid, u.lastname, u.firstname, u.fk_societe, u.email";
+    $sql = "SELECT u.rowid, u.lastname, u.firstname, u.fk_soc, u.email";
    $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
    $sql.= " WHERE entity IN (0,".$conf->entity.")";

@ -194,7 +194,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
        {
            $obj = $db->fetch_object($resql);
            $var=!$var;
-            if (!$obj->fk_societe)
+            if (!$obj->fk_soc)
            {
                $username=dolGetFirstLastname($obj->firstname,$obj->lastname);
                $internalusers[$obj->rowid] = $username;
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@ -261,7 +261,7 @@ $form=new Form($db);
 //if ($mesg) print $mesg;

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("PropalSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');

 $head = propal_admin_prepare_head();

--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@ -81,7 +81,7 @@ $form = new Form($db);

 llxHeader('',$langs->trans("Proxy"));

-print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
+print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');

 print $langs->trans("ProxyDesc")."<br>\n";
 print "<br>\n";
--- a/htdocs/admin/salaries.php
+++ b/htdocs/admin/salaries.php
@ -77,7 +77,7 @@ llxHeader('',$langs->trans('SalariesSetup'));
 $form = new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('SalariesSetup'),$linkback,'setup');
+print_fiche_titre($langs->trans('SalariesSetup'),$linkback,'title_setup');

 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@ -185,7 +185,7 @@ $form = new Form($db);

 llxHeader('',$langs->trans("Passwords"));

-print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
+print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');

 print $langs->trans("GeneratedPasswordDesc")."<br>\n";
 print "<br>\n";
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@ -111,7 +111,7 @@ $form = new Form($db);

 llxHeader('',$langs->trans("Files"));

-print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
+print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');

 //print $langs->trans("FilesDesc")."<br>\n";
 //print "<br>\n";
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@ -89,7 +89,7 @@ $form = new Form($db);

 llxHeader('',$langs->trans("Miscellaneous"));

-print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
+print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');

 print $langs->trans("MiscellaneousDesc")."<br>\n";
 print "<br>\n";
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@ -147,7 +147,7 @@ if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
 $wikihelp='EN:Setup Sms|FR:Paramétrage Sms|ES:Configuración Sms';
 llxHeader('',$langs->trans("Setup"),$wikihelp);

-print_fiche_titre($langs->trans("SmsSetup"),'','setup');
+print_fiche_titre($langs->trans("SmsSetup"),'','title_setup');

 print $langs->trans("SmsDesc")."<br>\n";
 print "<br>\n";
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@ -110,7 +110,7 @@ llxHeader('',$langs->trans("MailmanSpipSetup"),$help_url);


 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup');


 $head = mailmanspip_admin_prepare_head();
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@ -113,7 +113,7 @@ if($action)
 llxHeader('',$langs->trans("StockSetup"));

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("StockSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("StockSetup"),$linkback,'title_setup');

 $form=new Form($db);

--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@ -194,7 +194,7 @@ llxHeader("","");
 $form=new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');

 print "<br>";

--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@ -218,7 +218,7 @@ $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 llxHeader("","");

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');

 print "<br>";

--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@ -74,7 +74,7 @@ $textobject=$langs->transnoentitiesnoconv("BillsSuppliers");
 llxHeader('',$langs->trans("SuppliersSetup"));

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
 print "<br>\n";

 $head = supplierorder_admin_prepare_head();
--- a/htdocs/admin/supplierinvoicedet_extrafields.php
+++ b/htdocs/admin/supplierinvoicedet_extrafields.php
@ -74,7 +74,7 @@ $textobject=$langs->transnoentitiesnoconv("BillsSuppliers");
 llxHeader('',$langs->trans("SuppliersSetup"));

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
 print "<br>\n";

 $head = supplierorder_admin_prepare_head();
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@ -70,7 +70,7 @@ $textobject=$langs->transnoentitiesnoconv("SuppliersOrders");
 llxHeader('',$langs->trans("SuppliersSetup"));

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
 print "<br>\n";

 $head = supplierorder_admin_prepare_head();
--- a/htdocs/admin/supplierorderdet_extrafields.php
+++ b/htdocs/admin/supplierorderdet_extrafields.php
@ -71,7 +71,7 @@ $textobject=$langs->transnoentitiesnoconv("SuppliersOrders");
 llxHeader('',$langs->trans("SuppliersSetup"));

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
 print "<br>\n";

 $head = supplierorder_admin_prepare_head();
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@ -147,7 +147,7 @@ llxHeader();
 $form=new Form($db);

 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SyslogSetup"),$linkback,'setup');
+print_fiche_titre($langs->trans("SyslogSetup"),$linkback,'title_setup');
 print '<br>';

 $def = array();
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@ -38,7 +38,7 @@ $langs->load("members");
 llxHeader();


-print_fiche_titre("Dolibarr",'','setup');
+print_fiche_titre("Dolibarr",'','title_setup');

 print '<div style="padding-left: 30px;">'.img_picto_common('', 'dolibarr_box.png','height="120"').'</div>';

--- a/htdocs/admin/system/browser.php
+++ b/htdocs/admin/system/browser.php
@ -42,7 +42,7 @@ $form=new Form($db);

 llxHeader();

-print_fiche_titre($langs->trans("InfoBrowser"),'','setup');
+print_fiche_titre($langs->trans("InfoBrowser"),'','title_setup');

 $tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);

--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@ -39,7 +39,7 @@ if (!$user->admin)

 llxHeader();

-print_fiche_titre($langs->trans("SummaryConst"),'','setup');
+print_fiche_titre($langs->trans("SummaryConst"),'','title_setup');


 print_titre($langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')');
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@ -46,7 +46,7 @@ if ($action == 'convert')

 llxHeader();

-print_fiche_titre($langs->trans("Tables")." ".ucfirst($conf->db->type),'','setup');
+print_fiche_titre($langs->trans("Tables")." ".ucfirst($conf->db->type),'','title_setup');


 // Define request to get table description
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@ -39,7 +39,7 @@ $form=new Form($db);

 llxHeader();

-print_fiche_titre($langs->trans("InfoDatabase"),'','setup');
+print_fiche_titre($langs->trans("InfoDatabase"),'','title_setup');

 // Database
 print '<table class="noborder" width="100%">';
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@ -41,7 +41,7 @@ $table=GETPOST('table','alpha');
 llxHeader();


-print_fiche_titre($langs->trans("Table") . " ".$table,'','setup');
+print_fiche_titre($langs->trans("Table") . " ".$table,'','title_setup');

 // Define request to get table description
 $base=0;
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@ -42,7 +42,7 @@ $form=new Form($db);

 llxHeader();

-print_fiche_titre($langs->trans("InfoDolibarr"),'','setup');
+print_fiche_titre($langs->trans("InfoDolibarr"),'','title_setup');

 // Version
 $var=true;
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@ -37,7 +37,7 @@ if (!$user->admin)

 llxHeader();

-print_fiche_titre($langs->trans("FileCheckDolibarr"),'','setup');
+print_fiche_titre($langs->trans("FileCheckDolibarr"),'','title_setup');

 // Version
 $var = true;
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@ -45,7 +45,7 @@ if (! $user->admin) accessforbidden();

 llxHeader();

-print_fiche_titre($langs->trans("SummarySystem"),'','setup');
+print_fiche_titre($langs->trans("SummarySystem"),'','title_setup');


 print '<table class="noborder" width="100%">';
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@ -39,7 +39,7 @@ if (! $user->admin)

 llxHeader();

-print_fiche_titre($langs->trans("AvailableModules"),'','setup');
+print_fiche_titre($langs->trans("AvailableModules"),'','title_setup');

 print $langs->trans("ToActivateModule").'<br>';
 print "<br>\n";
--- a/htdocs/admin/system/os.php
+++ b/htdocs/admin/system/os.php
@ -35,7 +35,7 @@ if (!$user->admin)

 llxHeader();

-print_fiche_titre($langs->trans("InfoOS"),'','setup');
+print_fiche_titre($langs->trans("InfoOS"),'','title_setup');

 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@ -48,7 +48,7 @@ $nowstring=dol_print_date(dol_now(),'dayhourlog');

 llxHeader();

-print_fiche_titre($langs->trans("PerfDolibarr"),'','setup');
+print_fiche_titre($langs->trans("PerfDolibarr"),'','title_setup');

 print $langs->trans("YouMayFindPerfAdviceHere",'http://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').' (<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Reload").'</a>)<br>';

--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@ -43,7 +43,7 @@ $title='InfoPHP';

 if (isset($title))
 {
-	print_fiche_titre($langs->trans($title), '', 'setup');
+	print_fiche_titre($langs->trans($title), '', 'title_setup');
 }


--- a/htdocs/admin/system/web.php
+++ b/htdocs/admin/system/web.php
@ -42,7 +42,7 @@ if (!$user->admin) accessforbidden();

 llxHeader();

-print_fiche_titre($langs->trans("InfoWebServer"),'','setup');
+print_fiche_titre($langs->trans("InfoWebServer"),'','title_setup');

 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\"><td>".$langs->trans("Parameter")."</td><td>".$langs->trans("Value")."</td></tr>\n";
--- a/Show More
+++ b/Show More