diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 3367978d3bf..202b704df3b 100755
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -23,201 +23,240 @@
  * $Source$
  */
 
+/**
+        \file       htdocs/product/document.php
+        \ingroup    product
+        \brief      Page des documents joints sur les produits
+        \version    $Revision$
+*/
+
 require('./pre.inc.php');
-require_once('../product.class.php');
+require_once(DOL_DOCUMENT_ROOT."/product.class.php");
 
 $user->getrights('produit');
 
 if (!$user->rights->produit->lire)
 	accessforbidden();
 
+$productid=empty($_GET['id']) ? 0 : intVal($_GET['id']);
+$action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
+if ($productid > 0)
+{
+	$product = new Product($db);
+	if ($product->fetch($productid))
+    $prodref = sanitize_string($product->ref);
+    $upload_dir = $conf->produit->dir_output.'/'.$prodref;
+}
+
+/*
+ * Action envoie fichier
+ */
+if ( $_POST["sendit"] && $conf->upload)
+{
+    if (is_dir($upload_dir))
+    {
+        if (doliMoveFileUpload($_FILES['userfile']['tmp_name'], $upload_dir . "/" . $_FILES['userfile']['name']))
+        {
+            $mesg = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>';
+            //print_r($_FILES);
+        }
+        else
+        {
+            // Echec transfert (fichier dépassant la limite ?)
+            $mesg = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
+            // print_r($_FILES);
+        }
+    }
+}
+
 
 
 llxHeader();
 
-$productid=empty($_GET['id']) ? 0 : intVal($_GET['id']);
-$action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
-
-
-function do_upload ($upload_dir)
-{
-	global $local_file, $error_msg, $langs;
-
-	if (! is_dir($upload_dir))
-	{
-		create_exdir($upload_dir);
-	}
-
-	if (doliMoveFileUpload($_FILES['userfile']['tmp_name'], $upload_dir . '/' . $_FILES['userfile']['name']))
-	{
-		echo $langs->trans('FileUploaded');
-	}
-	else
-	{
-		echo $langs->trans('FileNotUploaded');
-	}
-}
-
-/******************************************************************************/
-/*                     Actions                                                */
-/******************************************************************************/
 
 if ($productid > 0)
 {
-	$product = new Product($db);
+	if ( $error_msg )
+	{ 
+		echo '<div class="error">'.$error_msg.'</div><br>';
+	}
 
-	if ($product->fetch($productid))
+	if ($action=='delete')
+	{
+		$file = $upload_dir . '/' . urldecode($_GET['urlfile']);
+		dol_delete_file($file);
+	}
+
+	$h=0;
+
+    $head[$h][0] = DOL_URL_ROOT."/product/fiche.php?id=".$product->id;
+    $head[$h][1] = $langs->trans("Card");
+    $hselected = $h;
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$product->id;
+    $head[$h][1] = $langs->trans("Price");
+    $h++;
+
+    if($product->type == 0)
     {
-		$prodref = sanitize_string($product->ref);
-		$upload_dir = $conf->produit->dir_output.'/'.$prodref;
-		if ( $error_msg )
-		{ 
-			echo '<B>'.$error_msg.'</B><BR><BR>';
-		}
-
-/******************************************************************************/
-/*                     Actions                                                */
-/******************************************************************************/
-		if ($action=='delete')
-		{
-			$file = $upload_dir . '/' . urldecode($_GET['urlfile']);
-			dol_delete_file($file);
-		}
-
-		if ( $_POST['sendit'] )
-		{
-			do_upload ($upload_dir);
-		}
-
-		$h=0;
-
-            $head[$h][0] = DOL_URL_ROOT."/product/fiche.php?id=".$product->id;
-            $head[$h][1] = $langs->trans("Card");
-            $hselected = $h;
-            $h++;
-
-            $head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$product->id;
-            $head[$h][1] = $langs->trans("Price");
-            $h++;
-
-            if($product->type == 0)
+        if ($user->rights->barcode->lire)
+        {
+            if ($conf->barcode->enabled)
             {
-                if ($user->rights->barcode->lire)
-                {
-                    if ($conf->barcode->enabled)
-                    {
-                        $head[$h][0] = DOL_URL_ROOT."/product/barcode.php?id=".$product->id;
-                        $head[$h][1] = $langs->trans("BarCode");
-                        $h++;
-                    }
-                }
-            }
-
-            $head[$h][0] = DOL_URL_ROOT."/product/photos.php?id=".$product->id;
-            $head[$h][1] = $langs->trans("Photos");
-            $h++;
-
-            if($product->type == 0)
-            {
-                if ($conf->stock->enabled)
-                {
-                    $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$product->id;
-                    $head[$h][1] = $langs->trans("Stock");
-                    $h++;
-                }
-            }
-
-            if ($conf->fournisseur->enabled)
-            {
-                $head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$product->id;
-                $head[$h][1] = $langs->trans("Suppliers");
+                $head[$h][0] = DOL_URL_ROOT."/product/barcode.php?id=".$product->id;
+                $head[$h][1] = $langs->trans("BarCode");
                 $h++;
             }
+        }
+    }
 
-            $head[$h][0] = DOL_URL_ROOT."/product/stats/fiche.php?id=".$product->id;
-            $head[$h][1] = $langs->trans('Statistics');
+    $head[$h][0] = DOL_URL_ROOT."/product/photos.php?id=".$product->id;
+    $head[$h][1] = $langs->trans("Photos");
+    $h++;
+
+    if($product->type == 0)
+    {
+        if ($conf->stock->enabled)
+        {
+            $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$product->id;
+            $head[$h][1] = $langs->trans("Stock");
             $h++;
+        }
+    }
 
-	    //erics: pour créer des produits composés de x 'sous' produits
-	    $head[$h][0] = DOL_URL_ROOT."/product/pack.php?id=".$product->id;
-	    $head[$h][1] = $langs->trans('Packs');
-	    $h++;
+    if ($conf->fournisseur->enabled)
+    {
+        $head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$product->id;
+        $head[$h][1] = $langs->trans("Suppliers");
+        $h++;
+    }
 
-            $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$product->id;
-            $head[$h][1] = $langs->trans('Referers');
-            $h++;
+    $head[$h][0] = DOL_URL_ROOT."/product/stats/fiche.php?id=".$product->id;
+    $head[$h][1] = $langs->trans('Statistics');
+    $h++;
 
-		$head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$product->id;
-		$head[$h][1] = $langs->trans('Documents');
-		$hselected=$h;
-		$h++;
+    //erics: pour créer des produits composés de x 'sous' produits
+    $head[$h][0] = DOL_URL_ROOT."/product/pack.php?id=".$product->id;
+    $head[$h][1] = $langs->trans('Packs');
+    $h++;
 
-		dolibarr_fiche_head($head, $hselected, $langs->trans('Product').': '.$product->ref);
+        $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$product->id;
+        $head[$h][1] = $langs->trans('Referers');
+        $h++;
 
-		print_titre($langs->trans('AssociatedDocuments').' '.$product->ref_url);
+	$head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$product->id;
+	$head[$h][1] = $langs->trans('Documents');
+	$hselected=$h;
+	$h++;
+
+	dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref);
+
+    // Construit liste des fichiers
+    clearstatcache();
+
+    $totalsize=0;
+    $filearray=array();
+
+    $errorlevel=error_reporting();
+	error_reporting(0);
+	$handle=opendir($upload_dir);
+	error_reporting($errorlevel);
+    if ($handle)
+    {
+        $i=0;
+        while (($file = readdir($handle))!==false)
+        {
+            if (!is_dir($dir.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
+            {
+                $filearray[$i]=$file;
+                $totalsize+=filesize($upload_dir."/".$file);
+                $i++;
+            }
+        }
+        closedir($handle);
+    }
+    else
+    {
+//            print '<div class="error">'.$langs->trans("ErrorCanNotReadDir",$upload_dir).'</div>';
+    }
+    
+    print '<table class="border"width="100%">';
+    print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">'.$product->ref.'</td></tr>';
+    print '<tr><td width="30%">'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td></tr>';
+    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.sizeof($filearray).'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '</table>';
+
+    print '</div>';
+
+
+    // Affiche forumlaire upload
+    if (defined('MAIN_UPLOAD_DOC') && $conf->upload)
+    {
+		print_titre($langs->trans('AttachANewFile'));
 
 		print '<form name="userfile" action="document.php?id='.$product->id.'" enctype="multipart/form-data" method="POST">';
-		print '<input type="hidden" name="max_file_size" value="2000000">';
-		print '<input type="file"   name="userfile" size="40" maxlength="80" class="flat"><br>';
-		print '<input type="submit" value="'.$langs->trans('Upload').'" name="sendit" class="button">';
-		print '<input type="submit" value="'.$langs->trans('Cancel').'" name="cancelit" class="button"><br>';
-		print '</form><br>';
 
-		clearstatcache();
+        print '<table class="noborder" width="100%">';
+        print '<tr><td width="50%" valign="top">';
 
-        $errorlevel=error_reporting();
-		error_reporting(0);
-		$handle=opendir($upload_dir);
-		error_reporting($errorlevel);
+        print '<input type="hidden" name="max_file_size" value="2000000">';
+        print '<input class="flat" type="file" name="userfile" size="40" maxlength="80">';
+        print ' &nbsp; ';
+        print '<input type="submit" class="button" value="'.$langs->trans("Add").'" name="sendit">';
 
-		print '<table width="100%" class="noborder">';
+        print "</td></tr>";
+        print "</table>";
 
-		if ($handle)
-		{
-    		print '<tr class="liste_titre">';
-			print '<td>'.$langs->trans('Document').'</td>';
-			print '<td align="right">'.$langs->trans('Size').'</td>';
-			print '<td align="center">'.$langs->trans('Date').'</td>';
-			print '<td>&nbsp;</td>';
-			print '</tr>';
-			$var=true;
-			while (($file = readdir($handle))!==false)
-			{
-				if (!is_dir($dir.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
-				{
-					$var=!$var;
-					print '<tr '.$bc[$var].'>';
-					print '<td>';
-					echo '<a href="'.DOL_URL_ROOT.'/document.php?modulepart=produit&file='.$prodref.'/'.urlencode($file).'">'.$file.'</a>';
-					print "</td>\n";
-					print '<td align="right">'.filesize($upload_dir.'/'.$file). ' bytes</td>';
-					print '<td align="center">'.strftime('%d %b %Y %H:%M:%S',filemtime($upload_dir.'/'.$file)).'</td>';
-					print '<td align="center">';
-					if ($file == $propref . '.pdf')
-					{
-						echo '-';
-					}
-					else
-					{
-						echo '<a href="'.DOL_URL_ROOT.'/product/document.php?id='.$product->id.'&action=delete&urlfile='.urlencode($file).'">'.$langs->trans('Delete').'</a>';
-					}
-					print "</td></tr>\n";
-				}
-			}
-			closedir($handle);
-		}
-		else
-		{
-			print '<div class="error">'.$langs->trans('ErrorCantOpenDir').'<b> '.$upload_dir.'</b></div>';
-		}
-		print '</table>';
+        print '</form>';
+        print '<br>';
+    }
+    
+    $errorlevel=error_reporting();
+	error_reporting(0);
+	$handle=opendir($upload_dir);
+	error_reporting($errorlevel);
 
-        print '</div>';
-	}
-	else
+	print '<table width="100%" class="noborder">';
+
+	if ($handle)
 	{
-		dolibarr_print_error($db);
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans('Document').'</td>';
+		print '<td align="right">'.$langs->trans('Size').'</td>';
+		print '<td align="center">'.$langs->trans('Date').'</td>';
+		print '<td>&nbsp;</td>';
+		print '</tr>';
+		$var=true;
+		while (($file = readdir($handle))!==false)
+		{
+			if (!is_dir($dir.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
+			{
+				$var=!$var;
+				print '<tr '.$bc[$var].'>';
+				print '<td>';
+				echo '<a href="'.DOL_URL_ROOT.'/document.php?modulepart=produit&file='.$prodref.'/'.urlencode($file).'">'.$file.'</a>';
+				print "</td>\n";
+				print '<td align="right">'.filesize($upload_dir.'/'.$file). ' bytes</td>';
+				print '<td align="center">'.strftime('%d %b %Y %H:%M:%S',filemtime($upload_dir.'/'.$file)).'</td>';
+				print '<td align="center">';
+				if ($file == $propref . '.pdf')
+				{
+					echo '-';
+				}
+				else
+				{
+					echo '<a href="'.DOL_URL_ROOT.'/product/document.php?id='.$product->id.'&action=delete&urlfile='.urlencode($file).'">'.$langs->trans('Delete').'</a>';
+				}
+				print "</td></tr>\n";
+			}
+		}
+		closedir($handle);
 	}
+	print '</table>';
+
+    print '</div>';
 }
 else
 {