diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php
index 5f7b5893414..1a50e18e0f9 100644
--- a/htdocs/boutique/index.php
+++ b/htdocs/boutique/index.php
@@ -31,13 +31,6 @@ require("./pre.inc.php");
 
 $langs->load("boutique");
 
-$oscommercedb=new DoliDB($conf->global->OSC_DB_TYPE,$conf->global->OSC_DB_HOST,$conf->global->OSC_DB_USER,$conf->global->OSC_DB_PASS,$conf->global->OSC_DB_NAME);
-if (! $oscommercedb->connected)
-{
-	dolibarr_print_error($oscommercedb,"Failed to connect to OSCommerce with ".$conf->global->OSC_DB_TYPE.",".$conf->global->OSC_DB_HOST.",".$conf->global->OSC_DB_USER.",".$conf->global->OSC_DB_PASS.",".$conf->global->OSC_DB_NAME);
-	exit;
-}
-
 
 
 llxHeader("",$langs->trans("OSCommerceShop"),"");
@@ -61,14 +54,14 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Description").'</td>';
 print '<td align="right">'.$langs->trans("Total").'</td></tr>';
 
 $sql = "SELECT sum(t.value) as value, MONTH(o.date_purchased) as mois";
-$sql .= " FROM ".$oscommercedb->database_name.".orders_total as t";
-$sql .= " JOIN ".$oscommercedb->database_name.".orders as o ON o.orders_id = t.orders_id";
+$sql .= " FROM ".OSC_DB_NAME.".orders_total as t";
+$sql .= " JOIN ".OSC_DB_NAME.".orders as o ON o.orders_id = t.orders_id";
 $sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(now()) ";
 $sql .= " GROUP BY mois ORDER BY mois";
  
-if ( $db->query($sql) )
+if ( $dbosc->query($sql) )
 {
-  $num = $db->num_rows();
+  $num = $dbosc->num_rows();
 
   $var=True;
   $i=0;
@@ -76,7 +69,7 @@ if ( $db->query($sql) )
     {
 	   while ($i < $num)
 		{
-      	$objp = $db->fetch_object();
+      	$objp = $dbosc->fetch_object();
       	$var=!$var;
       	print "<tr $bc[$var]>";
       	print '<td align="left">'.$objp->mois.'</td>';
@@ -87,11 +80,11 @@ if ( $db->query($sql) )
     	}
 	}
 
-  $db->free();
+  $dbosc->free();
 }
 else
 {
-  dolibarr_print_error($db);
+  dolibarr_print_error($dbosc);
 }
 
 /* mensuel
@@ -101,14 +94,14 @@ $sql .= " FROM ".OSC_DB_NAME.".orders_total as t";
 $sql .= " JOIN ".OSC_DB_NAME.".orders as o ON o.orders_id = t.orders_id";
 $sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(now()) AND MONTH(o.date_purchased) = MONTH(now())";
  
-if ( $db->query($sql) )
+if ( $dbosc->query($sql) )
 {
-  $num = $db->num_rows();
+  $num = $dbosc->num_rows();
 
   $var=True;
   if ($num > 0)
     {
-      $objp = $db->fetch_object();
+      $objp = $dbosc->fetch_object();
       $var=!$var;
       print "<tr $bc[$var]>";
       print '<td>CA du mois en cours  </td>';
@@ -116,11 +109,11 @@ if ( $db->query($sql) )
       $i++;
     }
 
-  $db->free();
+  $dbosc->free();
 }
 else
 {
-  dolibarr_print_error($db);
+  dolibarr_print_error($dbosc);
 }
 */
 
@@ -135,13 +128,13 @@ from orders_total as t
 join orders as o on o.orders_id = t.orders_id where t.class = 'ot_subtotal' order by o.date_purchased desc
  */
 $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method";
-$sql .= " FROM ".$oscommercedb->database_name.".orders_total as t JOIN ".$oscommercedb->database_name.".orders as o on o.orders_id = t.orders_id ";
+$sql .= " FROM ".OSC_DB_NAME.".orders_total as t JOIN ".OSC_DB_NAME.".orders as o on o.orders_id = t.orders_id ";
 $sql .= " WHERE t.class = 'ot_subtotal' ORDER BY o.date_purchased desc";
 
-if ( $db->query($sql) ) 
+if ( $dbosc->query($sql) ) 
 {
 	$langs->load("orders");
-	$num = $db->num_rows();
+	$num = $dbosc->num_rows();
 	if ($num > 0)
 	{
 		$i = 0;
@@ -153,7 +146,7 @@ if ( $db->query($sql) )
 		while ($i < $num)
 		{
 
-			$obj = $db->fetch_object();
+			$obj = $dbosc->fetch_object();
 			print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>";
 			$i++;
 		}
@@ -162,20 +155,20 @@ if ( $db->query($sql) )
 }
 else
 {
-  dolibarr_print_error($db);
+  dolibarr_print_error($dbosc);
 }
 
 /*
  * 5 dernières commandes en attente
 */
 $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method";
-$sql .= " FROM ".$oscommercedb->database_name.".orders_total as t JOIN ".$oscommercedb->database_name.".orders as o on o.orders_id = t.orders_id ";
+$sql .= " FROM ".OSC_DB_NAME.".orders_total as t JOIN ".OSC_DB_NAME.".orders as o on o.orders_id = t.orders_id ";
 $sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 5 order by o.date_purchased desc";
 
-if ( $db->query($sql) ) 
+if ( $dbosc->query($sql) ) 
 {
   $langs->load("orders");
-  $num = $db->num_rows();
+  $num = $dbosc->num_rows();
   if ($num > 0)
     {
       $i = 0;
@@ -187,7 +180,7 @@ if ( $db->query($sql) )
       while ($i < $num)
 	{
 	  
-	  $obj = $db->fetch_object();
+	  $obj = $dbosc->fetch_object();
 	  print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>";
 	  $i++;
 	}
@@ -196,20 +189,20 @@ if ( $db->query($sql) )
 }
 else
 {
-  dolibarr_print_error($db);
+  dolibarr_print_error($dbosc);
 }
 
 /*
  * Commandes à traiter
  */
 $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method";
-$sql .= " FROM ".$oscommercedb->database_name.".orders_total as t JOIN ".$oscommercedb->database_name.".orders as o on o.orders_id = t.orders_id ";
+$sql .= " FROM ".OSC_DB_NAME.".orders_total as t JOIN ".OSC_DB_NAME.".orders as o on o.orders_id = t.orders_id ";
 $sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 2 order by o.date_purchased desc";
 
-if ( $db->query($sql) ) 
+if ( $dbosc->query($sql) ) 
 {
   $langs->load("orders");
-  $num = $db->num_rows();
+  $num = $dbosc->num_rows();
   if ($num > 0)
     {
       $i = 0;
@@ -221,7 +214,7 @@ if ( $db->query($sql) )
       while ($i < $num)
 	{
 	  
-	  $obj = $db->fetch_object();
+	  $obj = $dbosc->fetch_object();
 	  print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>";
 	  $i++;
 	}
@@ -230,7 +223,7 @@ if ( $db->query($sql) )
 }
 else
 {
-  dolibarr_print_error($db);
+  dolibarr_print_error($dbosc);
 }
 
 
@@ -239,14 +232,14 @@ print '</td></tr><tr>';
 * Derniers clients qui ont commandé
 */
 $sql = "SELECT o.orders_id, o.customers_name, o.delivery_country, o.date_purchased, t.value, s.orders_status_name as statut";
-$sql .= " FROM ".$oscommercedb->database_name.".orders_total as t JOIN ".$oscommercedb->database_name.".orders as o on o.orders_id = t.orders_id ";
-$sql .= " JOIN ".$oscommercedb->database_name.".orders_status as s on o.orders_status = s.orders_status_id and s.language_id = 1";
+$sql .= " FROM ".OSC_DB_NAME.".orders_total as t JOIN ".OSC_DB_NAME.".orders as o on o.orders_id = t.orders_id ";
+$sql .= " JOIN ".OSC_DB_NAME.".orders_status as s on o.orders_status = s.orders_status_id and s.language_id = 1";
 $sql .= " WHERE t.class = 'ot_subtotal' order by o.date_purchased desc";
 
-if ( $db->query($sql) ) 
+if ( $dbosc->query($sql) ) 
 {
   $langs->load("orders");
-  $num = $db->num_rows();
+  $num = $dbosc->num_rows();
   if ($num > 0)
     {
       $i = 0;
@@ -258,7 +251,7 @@ if ( $db->query($sql) )
       while ($i < $num)
 	{
 	  
-	  $obj = $db->fetch_object();
+	  $obj = $dbosc->fetch_object();
 	  print "<tr><td>$obj->date_purchased</td><td>$obj->customers_name</td><td>$obj->delivery_country</td><td>".price($obj->value)."</td><td>$obj->payment_method</td><td>$obj->orders_id</td><td>$obj->statut</td></tr>";
 	  $i++;
 	}
@@ -267,11 +260,11 @@ if ( $db->query($sql) )
 }
 else
 {
-  dolibarr_print_error($db);
+  dolibarr_print_error($dbosc);
 }
 print '</tr></table>';
 
-$db->close();
+$dbosc->close();
 
 llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/boutique/osc_master.inc.php b/htdocs/boutique/osc_master.inc.php
new file mode 100644
index 00000000000..c91936b332c
--- /dev/null
+++ b/htdocs/boutique/osc_master.inc.php
@@ -0,0 +1,41 @@
+<?PHP
+/* Copyright (C) 2004-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/boutique/master.inc.php
+        \brief      Fichier de preparation de l'environnement Dolibarr pour OSCommerce
+        \version    $Revision$
+*/
+
+require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php");
+
+
+/*
+ * Creation objet $dbosc
+ */
+$dbosc = new DoliDb($conf->db->type,$conf->global->OSC_DB_HOST,$conf->global->OSC_DB_USER,$conf->global->OSC_DB_PASS,$conf->global->OSC_DB_NAME);
+if (! $dbosc->connected)
+{
+    dolibarr_print_error($dbosc,"host=".$conf->global->OSC_DB_HOST.", user=".$conf->global->OSC_DB_USER.", databasename=".$conf->global->OSC_DB_NAME.", ".$db->error);
+    exit;   
+}
+
+?>
diff --git a/htdocs/boutique/pre.inc.php b/htdocs/boutique/pre.inc.php
index 579985b1263..cdaea7a77fd 100644
--- a/htdocs/boutique/pre.inc.php
+++ b/htdocs/boutique/pre.inc.php
@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**