diff --git a/htdocs/admin/webcalendar.php b/htdocs/admin/webcalendar.php
index e42cad79c9f..db12326b537 100644
--- a/htdocs/admin/webcalendar.php
+++ b/htdocs/admin/webcalendar.php
@@ -45,13 +45,8 @@ $def = array();
 $actiontest=$_POST["test"];
 $actionsave=$_POST["save"];
 
-// Test saisie mot de passe
-if ($_POST["phpwebcalendar_pass"] != $_POST["phpwebcalendar_pass2"])
-{
-    $mesg="<div class=\"error\">".$langs->trans("ErrorPasswordDiffers")."</div>";
-}
-// Positionne la variable pour le test d'affichage de l'icone
-elseif ($actionsave)
+// Sauvegardes parametres
+if ($actionsave)
 {
     $i=0;
 
@@ -104,11 +99,13 @@ elseif ($actiontest)
         $sql="SELECT cal_value FROM webcal_config WHERE cal_setting='application_name'";
         $resql=$webcal->localdb->query($sql);
         if ($resql) {
-            $mesg ="<div class=\"ok\">".$langs->trans("WebCalTestOk",$_POST["phpwebcalendar_host"],$_POST["phpwebcalendar_dbname"],$_POST["phpwebcalendar_user"]);
+            $mesg ="<div class=\"ok\">";
+            $mesg.=$langs->trans("WebCalTestOk",$_POST["phpwebcalendar_host"],$_POST["phpwebcalendar_dbname"],$_POST["phpwebcalendar_user"]);
             $mesg.="</div>";
         }
         else {
-            $mesg ="<div class=\"error\">".$langs->trans("WebCalErrorConnectOkButWrongDatabase");
+            $mesg ="<div class=\"error\">";
+            $mesg.=$langs->trans("WebCalErrorConnectOkButWrongDatabase");
             $mesg.="</div>";
         }
 
@@ -145,11 +142,13 @@ print '<br>';
 
 print '<form name="phpwebcalendarconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print "<table class=\"noborder\" width=\"100%\">";
+
 print "<tr class=\"liste_titre\">";
 print "<td width=\"30%\">".$langs->trans("Parameter")."</td>";
 print "<td>".$langs->trans("Value")."</td>";
 print "<td>".$langs->trans("Examples")."</td>";
 print "</tr>";
+
 print "<tr class=\"impair\">";
 print "<td>".$langs->trans("WebCalURL")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"phpwebcalendar_url\" value=\"". ($_POST["phpwebcalendar_url"]?$_POST["phpwebcalendar_url"]:$conf->global->PHPWEBCALENDAR_URL) . "\" size=\"40\"></td>";
@@ -157,6 +156,7 @@ print "<td>http://localhost/webcalendar/";
 print "<br>https://webcalendarserver/";
 print "</td>";
 print "</tr>";
+
 print "<tr class=\"pair\">";
 print "<td>".$langs->trans("WebCalServer")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"phpwebcalendar_host\" value=\"". ($_POST["phpwebcalendar_host"]?$_POST["phpwebcalendar_host"]:$conf->global->PHPWEBCALENDAR_HOST) . "\" size=\"30\"></td>";
@@ -164,6 +164,7 @@ print "<td>localhost";
 //print "<br>__dolibarr_main_db_host__ <i>(".$dolibarr_main_db_host.")</i>"
 print "</td>";
 print "</tr>";
+
 print "<tr class=\"impair\">";
 print "<td>".$langs->trans("WebCalDatabaseName")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"phpwebcalendar_dbname\" value=\"". ($_POST["phpwebcalendar_dbname"]?$_POST["phpwebcalendar_dbname"]:$conf->global->PHPWEBCALENDAR_DBNAME) . "\" size=\"30\"></td>";
@@ -171,6 +172,7 @@ print "<td>webcalendar";
 //print "<br>__dolibarr_main_db_name__ <i>(".$dolibarr_main_db_name.")</i>";
 print "</td>";
 print "</tr>";
+
 print "<tr class=\"pair\">";
 print "<td>".$langs->trans("WebCalUser")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"phpwebcalendar_user\" value=\"". ($_POST["phpwebcalendar_user"]?$_POST["phpwebcalendar_user"]:$conf->global->PHPWEBCALENDAR_USER) . "\" size=\"30\"></td>";
@@ -178,6 +180,7 @@ print "<td>webcaluser";
 //print "<br>__dolibarr_main_db_user__ <i>(".$dolibarr_main_db_user.")</i>";
 print "</td>";
 print "</tr>";
+
 print "<tr class=\"impair\">";
 print "<td>".$langs->trans("Password")."</td>";
 print "<td><input type=\"password\" class=\"flat\" name=\"phpwebcalendar_pass\" value=\"" . ($_POST["phpwebcalendar_pass"]?$_POST["phpwebcalendar_pass"]:$conf->global->PHPWEBCALENDAR_PASS) . "\" size=\"30\"></td>";
@@ -185,13 +188,7 @@ print '<td>';
 //if ($dolibarr_main_db_pass) print '__dolibarr_main_db_pass__ <i>('.eregi_replace('.','*',$dolibarr_main_db_pass).')</i>';
 print '&nbsp;</td>';
 print "</tr>";
-print "<tr class=\"pair\">";
-print "<td>".$langs->trans("PasswordRetype")."</td>";
-print "<td><input type=\"password\" class=\"flat\" name=\"phpwebcalendar_pass2\" value=\"" . ($_POST["phpwebcalendar_pass2"]?$_POST["phpwebcalendar_pass2"]:$conf->global->PHPWEBCALENDAR_PASS) ."\" size=\"30\"></td>";
-print '<td>';
-//if ($dolibarr_main_db_pass) print '__dolibarr_main_db_pass__ <i>('.eregi_replace('.','*',$dolibarr_main_db_pass).')</i>';
-print '&nbsp;</td>';
-print "</tr>";
+
 print "</table>";
 print "<br>";
 
diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php
index fb3821eb105..507adc74aca 100644
--- a/htdocs/conf/conf.class.php
+++ b/htdocs/conf/conf.class.php
@@ -60,6 +60,7 @@ class Conf
     var $projet;
     var $postnuke;
     var $webcal;
+    var $mantis;
     var $propal;
     var $categorie;
 	var $oscommerce2;
@@ -267,6 +268,13 @@ class Conf
 		$this->webcal->db->user=defined('PHPWEBCALENDAR_USER')?PHPWEBCALENDAR_USER:'';
 		$this->webcal->db->pass=defined('PHPWEBCALENDAR_PASS')?PHPWEBCALENDAR_PASS:'';
 		$this->webcal->db->name=defined('PHPWEBCALENDAR_DBNAME')?PHPWEBCALENDAR_DBNAME:'';
+		// Module mantis
+		$this->mantis->enabled=defined('MAIN_MODULE_MANTIS')?MAIN_MODULE_MANTIS:0;
+		$this->mantis->db->type=defined('PHPMANTIS_TYPE')?PHPMANTIS_TYPE:'mysql';
+		$this->mantis->db->host=defined('PHPMANTIS_HOST')?PHPMANTIS_HOST:'';
+		$this->mantis->db->user=defined('PHPMANTIS_USER')?PHPMANTIS_USER:'';
+		$this->mantis->db->pass=defined('PHPMANTIS_PASS')?PHPMANTIS_PASS:'';
+		$this->mantis->db->name=defined('PHPMANTIS_DBNAME')?PHPMANTIS_DBNAME:'';
 		// Module facture
 		$this->facture->enabled=defined("MAIN_MODULE_FACTURE")?MAIN_MODULE_FACTURE:0;
 		$this->facture->dir_output=DOL_DATA_ROOT."/facture";
diff --git a/htdocs/includes/menus/barre_top/default.php b/htdocs/includes/menus/barre_top/default.php
index 660f88b6bcc..b17ba423357 100644
--- a/htdocs/includes/menus/barre_top/default.php
+++ b/htdocs/includes/menus/barre_top/default.php
@@ -82,7 +82,7 @@ class MenuTop {
 
         print '<table class="tmenu"><tr class="tmenu">';
 
-        // Entrée home
+        // Home
         $id="";
 
         if ($_GET["mainmenu"] == "home" || ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home"))
@@ -98,7 +98,7 @@ class MenuTop {
         }
         print '<td class="tmenu"><a class="tmenu" '.($id?'id="'.$id.'" ':'').'href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").'</a></td>';
 
-        // Entrée adherent
+        // Adherent
         if ($conf->adherent->enabled && $user->rights->adherent->lire)
         {
             $langs->load("members");
@@ -120,7 +120,7 @@ class MenuTop {
             print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Members").'</a></td>';
         }
 
-        // Entrée commercial
+        // Commercial
         if ($conf->commercial->enabled && $user->rights->commercial->main->lire)
         {
             $langs->load("commercial");
@@ -143,7 +143,7 @@ class MenuTop {
 
         }
 
-        // Entrée compta/tréso (sert pour banque, tva, entités à facturer...)
+        // Compta/tréso (sert pour banque, tva, entités à facturer...)
         if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->caisse->enabled)
         {
 //            if ($user->rights->compta->general->lire || $user->rights->comptaexpert->general->lire)
@@ -168,7 +168,7 @@ class MenuTop {
 //            }
         }
 
-        // Entrée projets
+        // Projects
         if ($conf->projet->enabled && $user->rights->projet->lire)
         {
             $langs->load("projects");
@@ -191,7 +191,7 @@ class MenuTop {
             print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/projet/index.php?mainmenu=project">'.$chaine.'</a></td>';
         }
 
-        // Entrée produit/service
+        // Produit/service
         if (($conf->produit->enabled || $conf->service->enabled)  && $user->rights->produit->lire)
         {
             $langs->load("products");
@@ -218,7 +218,7 @@ class MenuTop {
 
         }
 
-        // Entrée fournisseur
+        // Supplier
         if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire)
         {
             $langs->load("suppliers");
@@ -240,7 +240,7 @@ class MenuTop {
             print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/fourn/index.php?mainmenu=suppliers"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Suppliers").'</a></td>';
         }
 
-        // Entrée telephonie
+        // Telephonie
         if ($conf->telephonie->enabled && $user->rights->telephonie->lire)
         {
             $class="";
@@ -256,7 +256,7 @@ class MenuTop {
             print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/telephonie/index.php?mainmenu=telephonie"'.($this->atarget?" target=$this->atarget":"").'>Telephonie</a></td>';
         }
 
-        // Entrée energie
+        // Energie
         if ($conf->energie->enabled)
         {
             $langs->load("energy");
@@ -273,7 +273,7 @@ class MenuTop {
             print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/energie/index.php?mainmenu=energie"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Energy").'</a></td>';
         }
         
-        // Entrée OSCommerce 1
+        // OSCommerce 1
         if ($conf->boutique->enabled)
         {
             $langs->load("shop");
@@ -290,7 +290,7 @@ class MenuTop {
             print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/boutique/index.php?mainmenu=boutique"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a></td>';
         }
 
-        // Entrée OSCommerce 2
+        // OSCommerce 2
         if ($conf->oscommerce2->enabled)
         {
             $langs->load("shop");
@@ -307,7 +307,7 @@ class MenuTop {
             print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/oscommerce_ws/index.php?mainmenu=oscommerce2"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a></td>';
         }
 
-        // Entrée webcal
+        // Webcal
         if ($conf->webcal->enabled)
         {
             $langs->load("other");
@@ -326,7 +326,29 @@ class MenuTop {
                 $class = 'class="tmenu"';
             }
 
-            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/projet/webcal.php?mainmenu=webcal"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Calendar").'</a></td>';
+            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/webcal/webcal.php?mainmenu=webcal"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Calendar").'</a></td>';
+        }
+
+        // Mantis
+        if ($conf->mantis->enabled)
+        {
+            $langs->load("other");
+
+            $class="";
+            if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mantis")
+            {
+                $class='class="tmenu" id="sel"';
+            }
+            elseif (ereg("^".DOL_URL_ROOT.".*\/mantis",$_SERVER["PHP_SELF"]) || ereg("^".DOL_URL_ROOT."\/mantis\/",$_SERVER["PHP_SELF"]))
+            {
+                $class='class="tmenu" id="sel"';
+            }
+            else
+            {
+                $class = 'class="tmenu"';
+            }
+
+            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/mantis/mantis.php?mainmenu=mantis"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("BugTracker").'</a></td>';
         }
 
     print '</tr></table>';
diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php
index a5cf184ab72..19ad3d6a2df 100644
--- a/htdocs/includes/menus/barre_top/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php
@@ -286,7 +286,29 @@ class MenuTop {
                 $class = 'class="tmenu"';
             }
         
-            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/projet/webcal.php?mainmenu=webcal&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Calendar").'</a></td>';
+            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/webcal/webcal.php?mainmenu=webcal&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Calendar").'</a></td>';
+        }
+
+        // Mantis
+        if ($conf->mantis->enabled)
+        {
+            $langs->load("other");
+
+            $class="";
+            if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mantis")
+            {
+                $class='class="tmenu" id="sel"';
+            }
+            elseif (ereg("^".DOL_URL_ROOT.".*\/mantis",$_SERVER["PHP_SELF"]) || ereg("^".DOL_URL_ROOT."\/mantis\/",$_SERVER["PHP_SELF"]))
+            {
+                $class='class="tmenu" id="sel"';
+            }
+            else
+            {
+                $class = 'class="tmenu"';
+            }
+
+            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/mantis/mantis.php?mainmenu=mantis"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("BugTracker").'</a></td>';
         }
        
         print '</tr></table>';
diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
index 4e59b909f45..759a43d09f9 100644
--- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
@@ -248,9 +248,31 @@ class MenuTop {
                 $class = 'class="tmenu"';
             }
         
-//            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/projet/webcal.php?mainmenu=webcal&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Calendar").'</a></td>';
+//            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/webcal/webcal.php?mainmenu=webcal&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Calendar").'</a></td>';
         }
-       
+
+        // Mantis
+        if ($conf->mantis->enabled)
+        {
+            $langs->load("other");
+
+            $class="";
+            if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mantis")
+            {
+                $class='class="tmenu" id="sel"';
+            }
+            elseif (ereg("^".DOL_URL_ROOT.".*\/mantis",$_SERVER["PHP_SELF"]) || ereg("^".DOL_URL_ROOT."\/mantis\/",$_SERVER["PHP_SELF"]))
+            {
+                $class='class="tmenu" id="sel"';
+            }
+            else
+            {
+                $class = 'class="tmenu"';
+            }
+
+            print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/mantis/mantis.php?mainmenu=mantis"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("BugTracker").'</a></td>';
+        }
+               
         print '</tr></table>';
 
     }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 2742d702302..0ebd03c53a3 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -177,6 +177,8 @@ Module800Name=OSCommerce 1
 Module800Desc=Interface to show an OSCommerce shop via direct database access
 Module900Name=OSCommerce 2
 Module900Desc=Interface to show an OSCommerce shop via Web services.\nThis module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
+Module1200Name=Mantis
+Module1200Desc=Mantis integration
 Module1780Name=Categories
 Module1780Desc=Categories' management
 Permission11=Read invoices
@@ -445,12 +447,12 @@ WebCalSetupSaved=Webcalendar setup saved successfully.
 WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
 WebCalTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 WebCalTestKo2=Connection to server '%s' with user '%s' failed.
+WebCalErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be a Webcalendar database.
 WebCalAddEventOnCreateActions=Add calendar event on actions create
 WebCalAddEventOnCreateCompany=Add calendar event on companies create
 WebCalAddEventOnStatusPropal=Add calendar event on commercial proposal status change
 WebCalAddEventOnStatusContract=Add calendar event on contract status change
 WebCalAddEventOnStatusBill=Add calendar event on bill status change
-WebCalErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be a Webcalendar database.
 ##### Invoices #####
 BillsSetup=Invoices module setup
 BillsDate=Invoices date
@@ -656,3 +658,14 @@ OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn
 OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
+##### Mantis #####
+MantisSetup=Mantis link setup
+MantisURL=URL for Mantis access
+MantisServer=Server hosting Mantis database
+MantisDatabaseName=Database name
+MantisUser=User to access database
+MantisSetupSaved=Mantis setup saved successfully.
+MantisTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
+MantisTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
+MantisTestKo2=Connection to server '%s' with user '%s' failed.
+MantisErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be a Mantis database.
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 9dc87e5d87e..6761a780587 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -177,6 +177,8 @@ Module800Name=OSCommerce 1
 Module800Desc=Interface de visualisation d'une boutique OSCommerce par accès direct en base.
 Module900Name=OSCommerce 2
 Module900Desc=Interface de visualisation d'une boutique OSCommerce par accès via des Web services.\nCe module requiert d'installer les fichiers de /oscommerce_ws/ws_server sur OSCommerce. Voir fichier README dans /oscommerce_ws/ws_server.
+Module1200Name=Mantis
+Module1200Desc=Interface avec le bug tracking Mantis
 Module1780Name=Catégories
 Module1780Desc=Gestion des catégories
 Permission11=Consulter les factures
@@ -445,12 +447,12 @@ WebCalSetupSaved=Les identifiants Webcalendar ont 
 WebCalTestOk=La connexion au serveur '%s' sur la base '%s' par l'utilisateur '%s' a réussi.
 WebCalTestKo1=La connexion au serveur '%s' a réussi mais la base '%s' n'a pu être atteinte.
 WebCalTestKo2=La connexion au serveur '%s' par l'utilisateur '%s' à échoué.
+WebCalErrorConnectOkButWrongDatabase=La connexion a réussie mais la base ne semble pas etre une base Webcalendar.
 WebCalAddEventOnCreateActions=Ajouter évênement dans calendrier sur création d'actions
 WebCalAddEventOnCreateCompany=Ajouter évênement dans calendrier sur création de sociétés
 WebCalAddEventOnStatusPropal=Ajouter évênement dans calendrier sur changement de statut des propositions commerciales
 WebCalAddEventOnStatusContract=Ajouter évênement dans calendrier sur changement de statut des contrats
 WebCalAddEventOnStatusBill=Ajouter évênement dans calendrier sur changement de statut des factures
-WebCalErrorConnectOkButWrongDatabase=La connexion a réussie mais la base ne semble pas etre une base webcalendar.
 ##### Invoices #####
 BillsSetup=Configuration du module Factures
 BillsDate=Date des factures
@@ -656,4 +658,14 @@ OSCommerceErrorConnectOkButWrongDatabase=La connexion a r
 OSCommerceTestOk=La connexion au serveur '%s' sur la base '%s' par l'utilisateur '%s' a réussi.
 OSCommerceTestKo1=La connexion au serveur '%s' a réussi mais la base '%s' n'a pu être atteinte.
 OSCommerceTestKo2=La connexion au serveur '%s' par l'utilisateur '%s' à échoué.
-
+##### Mantis #####
+MantisSetup=Configuration du lien avec le Bug Tracking Mantis
+MantisURL=Adresse (URL) d'accès à Mantis
+MantisServer=Serveur de la base de donnée de Mantis
+MantisDatabaseName=Nom de la base de données
+MantisUser=Identifiant d'accès à la base
+MantisSetupSaved=Les identifiants Mantis ont été correctement sauvegardés.
+MantisTestOk=La connexion au serveur '%s' sur la base '%s' par l'utilisateur '%s' a réussi.
+MantisTestKo1=La connexion au serveur '%s' a réussi mais la base '%s' n'a pu être atteinte.
+MantisTestKo2=La connexion au serveur '%s' par l'utilisateur '%s' à échoué.
+MantisErrorConnectOkButWrongDatabase=La connexion a réussie mais la base ne semble pas etre une base Mantis.
diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php
index 24f98394234..8c80671b9e3 100644
--- a/htdocs/lib/databases/mysql.lib.php
+++ b/htdocs/lib/databases/mysql.lib.php
@@ -125,10 +125,10 @@ class DoliDb
 
         // Essai connexion serveur
         $this->db = $this->connect($host, $user, $pass, $name, $newlink);
-
         if ($this->db)
         {
-			// Si client connecté avec charset different de celui de Dolibarr
+			// Si client connecté avec charset different de celui de la base Dolibarr
+			// (La base Dolibarr a été forcée en this->forcecharset à l'install)
 			if (mysql_client_encoding ( $this->db ) != $this->forcecharset)
 			{
 				$this->query("SET NAMES '".$this->forcecharset."'", $this->db);
@@ -141,7 +141,7 @@ class DoliDb
             // host, login ou password incorrect
             $this->connected = 0;
             $this->ok = 0;
-            dolibarr_syslog("DoliDB::DoliDB : Erreur Connect");
+            dolibarr_syslog("DoliDB::DoliDB : Erreur Connect mysql_error=".mysql_error());
         }
 
         // Si connexion serveur ok et si connexion base demandée, on essaie connexion base
@@ -194,8 +194,9 @@ class DoliDb
     */
     function connect($host, $login, $passwd, $name)
     {
+       	dolibarr_syslog("DoliDB::connect host=$host, login=$login, passwd=$passwd, name=$name");
         $this->db  = @mysql_connect($host, $login, $passwd);
-        //print "Resultat fonction connect: ".$this->db;
+        //print "Resultat fonction connect: ".$this->db." - mysql_error=".mysql_error();
         return $this->db;
     }
 
@@ -581,6 +582,7 @@ class DoliDb
             \param	        database		nom de la database à créer
             \return	        resource		resource définie si ok, null si ko
             \remarks        Ne pas utiliser les fonctions xxx_create_db (xxx=mysql, ...) car elles sont deprecated
+            				On force creation de la base avec le charset forcecharset
     */
     function DDLCreateDb($database)
     {
diff --git a/htdocs/mantis/mantis.php b/htdocs/mantis/mantis.php
new file mode 100644
index 00000000000..3ef6ad57382
--- /dev/null
+++ b/htdocs/mantis/mantis.php
@@ -0,0 +1,64 @@
+<?php
+/* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
+ *
+ * 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.
+ *
+ * $Id$
+ * $Source$
+ */
+
+/**	    \file       htdocs/mantis/mantis.php
+        \ingroup    mantis
+		\brief      Page générant 2 frames, une pour le menu Dolibarr, l'autre pour l'affichage de Mantis
+		\author	    Laurent Destailleur
+		\version    $Revision$
+*/
+
+require("./pre.inc.php");
+
+$url=PHPMANTIS_URL;
+$mainmenu=isset($_GET["mainmenu"])?$_GET["mainmenu"]:"";
+$leftmenu=isset($_GET["leftmenu"])?$_GET["leftmenu"]:"";
+
+print "
+<html>
+<head>
+<title>Dolibarr frame for Mantis</title>
+</head>
+
+<frameset rows=\"28,*\" border=0 framespacing=0 frameborder=0>
+    <frame name=\"barre\" src=\"mantistop.php?mainmenu=$mainmenu&leftmenu=$leftmenu\" noresize scrolling=\"NO\" noborder>
+    <frame name=\"main\" src=\"$url\">
+    <noframes>
+    <body>
+
+    </body>
+    </noframes>
+</frameset>
+
+<noframes>
+<body>
+	<br><center>
+	Malheureusement, votre navigateur est trop vieux pour visualiser cette zone.<br>
+	Il vous faut un navigateur gérant les frames.<br>
+	</center>
+</body>
+</noframes>
+
+</html>
+";
+
+
+?>
diff --git a/htdocs/projet/webcaltop.php b/htdocs/mantis/mantistop.php
similarity index 100%
rename from htdocs/projet/webcaltop.php
rename to htdocs/mantis/mantistop.php
diff --git a/htdocs/mantis/pre.inc.php b/htdocs/mantis/pre.inc.php
new file mode 100644
index 00000000000..0a90df576ad
--- /dev/null
+++ b/htdocs/mantis/pre.inc.php
@@ -0,0 +1,45 @@
+<?php
+/* Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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.
+ *
+ * $Id$
+ * $Source$
+ */
+
+/**
+		\file 		htdocs/mantis/pre.inc.php
+		\ingroup    mantis
+		\brief      Fichier de gestion du menu gauche du module mantis
+		\version    $Revision$
+*/
+
+require ("../main.inc.php");
+
+$user->getrights('mantis');
+
+function llxHeader($head = "", $title="", $help_url='')
+{
+	global $langs;
+	
+	top_menu($head, $title);
+	
+	$menu = new Menu();
+	
+	
+	
+	left_menu($menu->liste, $help_url);
+}
+?>
diff --git a/htdocs/webcal/pre.inc.php b/htdocs/webcal/pre.inc.php
new file mode 100644
index 00000000000..5acf23eb07a
--- /dev/null
+++ b/htdocs/webcal/pre.inc.php
@@ -0,0 +1,45 @@
+<?php
+/* Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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.
+ *
+ * $Id$
+ * $Source$
+ */
+
+/**
+		\file 		htdocs/webcal/pre.inc.php
+		\ingroup    webcalendar
+		\brief      Fichier de gestion du menu gauche du module webcalendar
+		\version    $Revision$
+*/
+
+require ("../main.inc.php");
+
+$user->getrights('webcal');
+
+function llxHeader($head = "", $title="", $help_url='')
+{
+	global $langs;
+	
+	top_menu($head, $title);
+	
+	$menu = new Menu();
+	
+	
+	
+	left_menu($menu->liste, $help_url);
+}
+?>
diff --git a/htdocs/projet/webcal.php b/htdocs/webcal/webcal.php
similarity index 97%
rename from htdocs/projet/webcal.php
rename to htdocs/webcal/webcal.php
index 0a709afdc99..034dfab6c2a 100644
--- a/htdocs/projet/webcal.php
+++ b/htdocs/webcal/webcal.php
@@ -17,10 +17,9 @@
  *
  * $Id$
  * $Source$
- *
  */
 
-/**	    \file       htdocs/projet/webcal.php
+/**	    \file       htdocs/wecal/webcal.php
         \ingroup    webcalendar
 		\brief      Page générant 2 frames, une pour le menu Dolibarr, l'autre pour l'affichage du calendrier
 		\author	    Laurent Destailleur
diff --git a/htdocs/webcal/webcaltop.php b/htdocs/webcal/webcaltop.php
new file mode 100644
index 00000000000..2f636cde68b
--- /dev/null
+++ b/htdocs/webcal/webcaltop.php
@@ -0,0 +1,44 @@
+<?php
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ *
+ * 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.
+ *
+ * $Id$
+ * $Source$
+ *
+ */
+
+/*!	\file htdocs/projet/webcaltop.php
+        \ingroup    webcalendar
+		\brief      Frame du haut Dolibarr pour l'affichage du calendrier
+		\author	    Laurent Destailleur
+		\version    $Revision$
+*/
+
+require ("../main.inc.php");
+
+top_menu("","","_top");
+
+?>
+
+
+
+
+
+
+
+
+
+