diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 3f49f6d713e..1d7a75fe76b 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -26,7 +26,7 @@
 /**
         \file       htdocs/comm/propal.php
         \ingroup    propale
-        \brief      Page liste des propales
+        \brief      Page liste des propales (vision commercial)
 */
 
 require('./pre.inc.php');
@@ -42,10 +42,10 @@ if (!$user->rights->propale->lire)
 
 if ($conf->projet->enabled) require_once '../project.class.php';
 if($conf->commande->enabled) require_once '../commande/commande.class.php';
-require('./propal_model_pdf.class.php');
-require('../propal.class.php');
-require('../actioncomm.class.php');
-require(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php');
+require_once('./propal_model_pdf.class.php');
+require_once('../propal.class.php');
+require_once('../actioncomm.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php');
 
 /*
  *  Sécurité accés client
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index ee3b350fb14..7a5286e7896 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -710,26 +710,28 @@ if ($_GET["action"] == 'create')
                 /*
                 * Produits
                 */
+                print '<br>';
                 print_titre($langs->trans("Products"));
 
                 print '<table class="noborder" width="100%">';
                 print '<tr class="liste_titre"><td>'.$langs->trans("Ref").'</td><td>'.$langs->trans("Product").'</td>';
                 print '<td align="right">'.$langs->trans("Price").'</td><td align="center">'.$langs->trans("Discount").'</td><td align="center">'.$langs->trans("Qty").'</td></tr>';
 
+                // Lignes de propal produits prédéfinis
                 $sql = "SELECT pt.rowid, p.label as product, p.ref, pt.price, pt.qty, p.rowid as prodid, pt.remise_percent";
                 $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pt, ".MAIN_DB_PREFIX."product as p WHERE pt.fk_product = p.rowid AND pt.fk_propal = ".$_GET["propalid"];
                 $sql .= " ORDER BY pt.rowid ASC";
                 $result = $db->query($sql);
                 if ($result)
                 {
-                    $num = $db->num_rows();
+                    $num = $db->num_rows($result);
                     $i = 0;
                     $var=True;
                     while ($i < $num)
                     {
-                        $objp = $db->fetch_object();
+                        $objp = $db->fetch_object($result);
                         $var=!$var;
-                        print "<tr $bc[$var]><td>[$objp->ref]</td>\n";
+                        print "<tr $bc[$var]><td>".img_object($langs->trans(""),"product")." ".$objp->ref."</td>\n";
                         print '<td>'.$objp->product.'</td>';
                         print "<td align=\"right\">".price($objp->price)."</td>";
                         print '<td align="center">'.$objp->remise_percent.'%</td>';
@@ -737,18 +739,20 @@ if ($_GET["action"] == 'create')
                         $i++;
                     }
                 }
+                // Lignes de propal non produits prédéfinis
                 $sql = "SELECT pt.rowid, pt.description as product,  pt.price, pt.qty, pt.remise_percent";
                 $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pt ";
                 $sql .= " WHERE  pt.fk_propal = ".$_GET["propalid"];
                 $sql .= " AND pt.fk_product = 0";
                 $sql .= " ORDER BY pt.rowid ASC";
-                if ($db->query($sql))
+                $result=$db->query($sql);
+                if ($result)
                 {
-                    $num = $db->num_rows();
+                    $num = $db->num_rows($result);
                     $i = 0;
                     while ($i < $num)
                     {
-                        $objp = $db->fetch_object();
+                        $objp = $db->fetch_object($result);
                         $var=!$var;
                         print "<tr $bc[$var]><td>&nbsp;</td>\n";
                         print '<td>'.$objp->product.'</td>';
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 3342e8aaf57..165ce23b362 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -132,8 +132,8 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
 	    {
 	      $obj = $db->fetch_object($resql);
 	      $var=!$var;
-	      print '<tr '.$bc[$var].'><td><a href="facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->facnumber.'</a></td>';
-	      print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("Showcompany"),"company").' '.dolibarr_trunc($obj->nom,50).'</a></td></tr>';
+	      print '<tr '.$bc[$var].'><td nowrap><a href="facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->facnumber.'</a></td>';
+	      print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("Showcompany"),"company").' '.dolibarr_trunc($obj->nom,44).'</a></td></tr>';
 	      $i++;
 	    }
 
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index 0039cc5aec2..f2afb6facbf 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -19,11 +19,12 @@
  *
  * $Id$
  * $Source$
- *
  */
- 
+
 /**
-\todo Ce fichier ne semble plus utilisé. A virer ? NON Il est utilisé !
+        \file       htdocs/compta/propal.php
+        \ingroup    propale
+        \brief      Page liste des propales (vision compta)
 */
 
 require("./pre.inc.php");
@@ -31,7 +32,7 @@ require("./pre.inc.php");
 $user->getrights('facture');
 $user->getrights('propale');
 if (!$user->rights->propale->lire)
-  accessforbidden();
+accessforbidden();
 
 
 require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
@@ -39,532 +40,504 @@ require_once("../project.class.php");
 require_once("../propal.class.php");
 require_once("../actioncomm.class.php");
 
-/*
- * Sécurité accés client
- */
-if ($user->societe_id > 0) 
+// Sécurité accés client
+if ($user->societe_id > 0)
 {
-  $action = '';
-  $socidp = $user->societe_id;
+    $action = '';
+    $socidp = $user->societe_id;
 }
 
 if ($_GET["action"] == 'setstatut')
 {
-  /*
-   *  Classée la facture comme facturée
-   */
-  $propal = new Propal($db);
-  $propal->id = $_GET["propalid"];
-  $propal->cloture($user, $_GET["statut"], $note);
+    /*
+     *  Classée la facture comme facturée
+     */
+    $propal = new Propal($db);
+    $propal->id = $_GET["propalid"];
+    $propal->cloture($user, $_GET["statut"], $note);
 
 }
 
-llxHeader();
-
-
-
 if ( $action == 'delete' )
 {
-  $sql = "DELETE FROM ".MAIN_DB_PREFIX."propal WHERE rowid = $propalid;";
-  if ( $db->query($sql) )
+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."propal WHERE rowid = $propalid;";
+    if ( $db->query($sql) )
     {
 
-      $sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE fk_propal = $propalid ;";
-      if ( $db->query($sql) )
-	{
-	  print "<b><font color=\"red\">Propal supprimée</font></b>";
-	}
-      else
-	{
-	  print $db->error();
-	  print "<p>$sql";
-	} 
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE fk_propal = $propalid ;";
+        if ( $db->query($sql) )
+        {
+            print "<b><font color=\"red\">Propal supprimée</font></b>";
+        }
+        else
+        {
+            dolibarr_print_error($db);
+        }
     }
-  else
+    else
     {
-      print $db->error();
-      print "<p>$sql";
+        dolibarr_print_error($db);
     }
-  $propalid = 0;
-  $brouillon = 1;
+    $propalid = 0;
+    $brouillon = 1;
 }
 
+
+llxHeader();
+
 /*
  *
  * Mode fiche
  *
- *
  */
 if ($_GET["propalid"])
 {
-  $propal = new Propal($db);
-  $propal->fetch($_GET["propalid"]);
+    $propal = new Propal($db);
+    $propal->fetch($_GET["propalid"]);
 
-  if ($valid == 1)
+    if ($valid == 1)
     {
-      $propal->valid($user->id);
+        $propal->valid($user->id);
     }
-  /*
-   *
-   */
-  print "<table width=\"100%\">";
-  print "<tr><td><div class=\"titre\">Proposition commerciale : $propal->ref</div></td>";
-  print "</table>";
-  /*
-   *
-   */
-  $sql = "SELECT s.nom, s.idp, p.price, p.fk_projet,p.remise, p.tva, p.total, p.ref,".$db->pdate("p.datep")." as dp, c.id as statut, c.label as lst, p.note, x.firstname, x.name, x.fax, x.phone, x.email, p.fk_user_author, p.fk_user_valid, p.fk_user_cloture, p.datec, p.date_valid, p.date_cloture";
-  $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."socpeople as x";
-  $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND x.idp = p.fk_soc_contact AND p.rowid = ".$propal->id;
+    /*
+    *
+    */
+    print "<table width=\"100%\">";
+    print "<tr><td><div class=\"titre\">Proposition commerciale : $propal->ref</div></td>";
+    print "</table>";
+    /*
+    *
+    */
+    $sql = "SELECT s.nom, s.idp, p.price, p.fk_projet,p.remise, p.tva, p.total, p.ref,".$db->pdate("p.datep")." as dp, c.id as statut, c.label as lst, p.note, x.firstname, x.name, x.fax, x.phone, x.email, p.fk_user_author, p.fk_user_valid, p.fk_user_cloture, p.datec, p.date_valid, p.date_cloture";
+    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."socpeople as x";
+    $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND x.idp = p.fk_soc_contact AND p.rowid = ".$propal->id;
 
-  $result = $db->query($sql);
+    $result = $db->query($sql);
 
-  if ( $result ) {
-    $obj = $db->fetch_object($result);
-    
-    if ($db->num_rows()) {
-            
-      $color1 = "#e0e0e0";
+    if ( $result )
+    {
+        $obj = $db->fetch_object($result);
 
-      print '<table class="border" width="100%">';
+        if ($db->num_rows())
+        {
+            $color1 = "#e0e0e0";
 
-      print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2"><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
-      print "<td valign=\"top\" width=\"50%\" rowspan=\"9\">Note :<br>". nl2br($obj->note)."</td></tr>";
-      //
+            print '<table class="border" width="100%">';
 
-      print '<tr><td>'.$langs->trans("Date").'</td><td colspan="2">'.dolibarr_print_date($obj->dp).'</td></tr>';
+            print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2"><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
+            print "<td valign=\"top\" width=\"50%\" rowspan=\"9\">Note :<br>". nl2br($obj->note)."</td></tr>";
+            //
 
-      if ($obj->fk_projet) 
-	{
-	  $projet = new Project($db);
-	  $projet->fetch($obj->fk_projet); 
-	  print '<tr><td>'.$langs->trans("Project").'</td><td colspan="1">';
-	  print '<a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$projet->id.'">';
-	  print $projet->title.'</a></td></tr>';
-	}
-      print "<tr><td>Destinataire</td><td colspan=\"2\">$obj->firstname $obj->name &lt;$obj->email&gt;</td></tr>";
-      /*
-       *
-       */
+            print '<tr><td>'.$langs->trans("Date").'</td><td colspan="2">'.dolibarr_print_date($obj->dp).'</td></tr>';
 
-      print "<tr><td bgcolor=\"$color1\">".$langs->trans("AmountHT")."</td><td colspan=\"2\" bgcolor=\"$color1\" align=\"right\">".price($obj->price + $obj->remise)." euros</td></tr>";
-      /*
-       *
-       */
+            if ($obj->fk_projet)
+            {
+                $projet = new Project($db);
+                $projet->fetch($obj->fk_projet);
+                print '<tr><td>'.$langs->trans("Project").'</td><td colspan="1">';
+                print '<a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$projet->id.'">';
+                print $projet->title.'</a></td></tr>';
+            }
+            print "<tr><td>Destinataire</td><td colspan=\"2\">$obj->firstname $obj->name &lt;$obj->email&gt;</td></tr>";
+            /*
+            *
+            */
 
-      print "<tr><td bgcolor=\"$color1\">".$langs->trans("Discount")."</td><td colspan=\"2\" bgcolor=\"$color1\" align=\"right\">".price($obj->remise)." euros</td></tr>";
+            print "<tr><td bgcolor=\"$color1\">".$langs->trans("AmountHT")."</td><td colspan=\"2\" bgcolor=\"$color1\" align=\"right\">".price($obj->price + $obj->remise)." euros</td></tr>";
+            /*
+            *
+            */
 
-      /*
-       *
-       */
+            print "<tr><td bgcolor=\"$color1\">".$langs->trans("Discount")."</td><td colspan=\"2\" bgcolor=\"$color1\" align=\"right\">".price($obj->remise)." euros</td></tr>";
 
-      $totalht = $propal->price ;
+            /*
+            *
+            */
 
-      print "<tr><td bgcolor=\"$color1\">".$langs->trans("TotalHT")."</td><td colspan=\"2\" bgcolor=\"$color1\" align=\"right\"><b>".price($totalht)."</b> euros</td></tr>";
-      /*
-       *
-       */
-      print '<tr><td>'.$langs->trans("Author").'</td><td colspan="2">';
-      $author = new User($db, $obj->fk_user_author);
-      $author->fetch('');
-      print $author->fullname.'</td></tr>';
-      /*
-       *
-       */
-      print "<tr><td>".$langs->trans("Propal")." PDF</a></td>";
-      $file = $conf->propal->dir_output. "/$obj->ref/$obj->ref.pdf";
-      $relativepath = "$obj->ref/$obj->ref.pdf";
+            $totalht = $propal->price ;
 
-      if (file_exists($file)) {
-	    print '<td colspan="2"><a href="'.DOL_URL_ROOT.'/document.php?type=propal&file='.urlencode($relativepath).'">'.$obj->ref.'.pdf</a></td></tr>';
-      }
-      print '</tr>';
-      /*
-       *
-       */
-      print '<tr bgcolor="#f0f0f0"><td>'.$langs->trans("Status").' :</td><td colspan=2 align=center><b>'.$obj->lst.'</b></td>';
+            print "<tr><td bgcolor=\"$color1\">".$langs->trans("TotalHT")."</td><td colspan=\"2\" bgcolor=\"$color1\" align=\"right\"><b>".price($totalht)."</b> euros</td></tr>";
+            /*
+            *
+            */
+            print '<tr><td>'.$langs->trans("Author").'</td><td colspan="2">';
+            $author = new User($db, $obj->fk_user_author);
+            $author->fetch('');
+            print $author->fullname.'</td></tr>';
+            /*
+            *
+            */
+            print "<tr><td>".$langs->trans("Propal")." PDF</a></td>";
+            $file = $conf->propal->dir_output. "/$obj->ref/$obj->ref.pdf";
+            $relativepath = "$obj->ref/$obj->ref.pdf";
 
-      print '</tr>';
+            if (file_exists($file)) {
+                print '<td colspan="2"><a href="'.DOL_URL_ROOT.'/document.php?type=propal&file='.urlencode($relativepath).'">'.$obj->ref.'.pdf</a></td></tr>';
+            }
+            print '</tr>';
+            /*
+            *
+            */
+            print '<tr bgcolor="#f0f0f0"><td>'.$langs->trans("Status").' :</td><td colspan=2 align=center><b>'.$obj->lst.'</b></td>';
+
+            print '</tr>';
 
 
-      print "</table>";
+            print "</table>";
 
-      if ($action == 'statut')
-	{
-	  print "<form action=\"propal.php?propalid=".$propal->id."\" method=\"post\">";
-	  print "<input type=\"hidden\" name=\"action\" value=\"setstatut\">";
-	  print "<select name=\"statut\">";
-	  print "<option value=\"2\">Signée";
-	  print "<option value=\"3\">Non Signée";
-	  print '</select>';
-	  print '<br><textarea cols="60" rows="6" wrap="soft" name="note">';
-	  print $obj->note . "\n----------\n";
-	  print '</textarea><br><input type="submit" value="Valider">';
-	  print "</form>";
-	}
-      
+            if ($action == 'statut')
+            {
+                print "<form action=\"propal.php?propalid=".$propal->id."\" method=\"post\">";
+                print "<input type=\"hidden\" name=\"action\" value=\"setstatut\">";
+                print "<select name=\"statut\">";
+                print "<option value=\"2\">Signée";
+                print "<option value=\"3\">Non Signée";
+                print '</select>';
+                print '<br><textarea cols="60" rows="6" wrap="soft" name="note">';
+                print $obj->note . "\n----------\n";
+                print '</textarea><br><input type="submit" value="Valider">';
+                print "</form>";
+            }
 
-      print "<table width=\"100%\" cellspacing=2>";
-      /*
-       *
-       */
-      print "<td valign=\"top\" width=\"50%\">";
-      /*
-       * Factures associees
-       */
-      $sql = "SELECT f.facnumber, f.total,".$db->pdate("f.datef")." as df, f.rowid as facid, f.fk_user_author, f.paye";
-      $sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."fa_pr as fp WHERE fp.fk_facture = f.rowid AND fp.fk_propal = ".$propal->id;
 
-      $result = $db->query($sql);
-      if ($result)
-	{
-	  $num_fac_asso = $db->num_rows();
-	  $i = 0; $total = 0;
-	  print "<br>";
-	  if ($num_fac_asso > 1)
-	    {
-	      print_titre("Factures associées");
-	    }
-	  else
-	    {
-	      print_titre("Facture associée");
-	    }
-	  print '<table class="border" width="100%">';
-	  print "<tr>";
-	  print '<td>'.$langs->trans("Ref").'</td>';
-	  print '<td>'.$langs->trans("Date").'</td>';
-	  print '<td>'.$langs->trans("Author").'</td>';
-	  print '<td align="right">'.$langs->trans("Price").'</td>';
-	  print "</tr>\n";
-	  
-	  $var=True;
-	  while ($i < $num_fac_asso)
-	    {
-	      $objp = $db->fetch_object();
-	      $var=!$var;
-	      print "<TR bgcolor=\"#e0e0e0\">";
-	      print "<TD><a href=\"../compta/facture.php?facid=$objp->facid\">$objp->facnumber</a>";
-	      if ($objp->paye)
-		{ 
-		  print " (<b>pay&eacute;e</b>)";
-		} 
-	      print "</TD>\n";
-	      print "<TD>".strftime("%d %B %Y",$objp->df)."</td>\n";
-	      if ($objp->fk_user_author <> $user->id)
-		{
-		  $fuser = new User($db, $objp->fk_user_author);
-		  $fuser->fetch();
-		  print "<td>".$fuser->fullname."</td>\n";
-		}
-	      else
-		{
-		  print "<td>".$user->fullname."</td>\n";
-		}
-	      print '<TD align="right">'.price($objp->total).'</TD>';
-	      print "</tr>";
-	      $total = $total + $objp->total;
-	      $i++;
-	    }
-	  print "<tr><td align=\"right\" colspan=\"4\">".$langs->trans("TotalHT").": <b>$total</b> ".$conf->monnaie."</td></tr>\n";
-	  print "</table>";
-	  $db->free();
-	}
-      print "</table>";
-      /*
-       * Que si le module commande est actif !
-       *
-       */
-      if($conf->commande->enabled) {
-	$nb_commande = sizeof($propal->commande_liste_array());
-	if ($nb_commande > 0)
-	  {
-	    $coms = $propal->commande_liste_array();
-	    print '<br><table class="border" width="100%">';
-	    
-	    if ($nb_commande == 1)
-	      
-	      {
-		print "<tr><td>Commande rattachée : ";
-		print '<a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$coms[$i].'">';
-		print img_file();
-		print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$coms[$i].'">'.$coms[$i]."</a>";
-		print "</td></tr>\n";
-	      }
-	    else
-	      {
-		print "<tr><td>Commandes rattachées</td></tr>\n";
-		
-		for ($i = 0 ; $i < $nb_commande ; $i++)
-		  {
-		    print '<tr><td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$coms[$i].'">'.$coms[$i]."</a></td>\n";
-		    print "</tr>\n";
-		  }
-	      }
-	    print "</table>";
-	  }
-      }
+            print "<table width=\"100%\" cellspacing=2>";
+
+            print "<td valign=\"top\" width=\"50%\">";
+
+            /*
+            * Factures associees
+            */
+            $sql = "SELECT f.facnumber, f.total,".$db->pdate("f.datef")." as df, f.rowid as facid, f.fk_user_author, f.paye";
+            $sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."fa_pr as fp WHERE fp.fk_facture = f.rowid AND fp.fk_propal = ".$propal->id;
+
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $num_fac_asso = $db->num_rows($result);
+                $i = 0; $total = 0;
+                print "<br>";
+                if ($num_fac_asso > 1)
+                {
+                    print_titre("Factures associées");
+                }
+                else
+                {
+                    print_titre("Facture associée");
+                }
+                print '<table class="noborder" width="100%">';
+                print "<tr class=\"liste_titre\">";
+                print '<td>'.$langs->trans("Ref").'</td>';
+                print '<td>'.$langs->trans("Date").'</td>';
+                print '<td>'.$langs->trans("Author").'</td>';
+                print '<td align="right">'.$langs->trans("Price").'</td>';
+                print "</tr>\n";
+
+                $var=True;
+                while ($i < $num_fac_asso)
+                {
+                    $objp = $db->fetch_object();
+                    $var=!$var;
+                    print "<tr $bc[$var]>";
+                    print "<td><a href=\"../compta/facture.php?facid=$objp->facid\">$objp->facnumber</a>";
+                    if ($objp->paye)
+                    {
+                        print " (<b>pay&eacute;e</b>)";
+                    }
+                    print "</td>\n";
+                    print "<td>".dolibarr_print_date($objp->df)."</td>\n";
+                    if ($objp->fk_user_author <> $user->id)
+                    {
+                        $fuser = new User($db, $objp->fk_user_author);
+                        $fuser->fetch();
+                        print "<td>".$fuser->fullname."</td>\n";
+                    }
+                    else
+                    {
+                        print "<td>".$user->fullname."</td>\n";
+                    }
+                    print '<td align="right">'.price($objp->total).'</td>';
+                    print "</tr>";
+                    $total = $total + $objp->total;
+                    $i++;
+                }
+                print "<tr class=\"liste_total\"><td align=\"right\" colspan=\"3\">".$langs->trans("TotalHT")."</td><td align=\"right\">".price($total)."</td></tr>\n";
+                print "</table>";
+                $db->free();
+            }
+            print "</table>";
+
+            /*
+             * Que si le module commande est actif !
+             */
+            if($conf->commande->enabled)
+            {
+                $nb_commande = sizeof($propal->commande_liste_array());
+                if ($nb_commande > 0)
+                {
+                    $coms = $propal->commande_liste_array();
+                    print '<br><table class="border" width="100%">';
+
+                    if ($nb_commande == 1)
+                    {
+                        print "<tr><td>Commande rattachée : ";
+                        print '<a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$coms[$i].'">';
+                        print img_file();
+                        print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$coms[$i].'">'.$coms[$i]."</a>";
+                        print "</td></tr>\n";
+                    }
+                    else
+                    {
+                        print "<tr><td>Commandes rattachées</td></tr>\n";
+
+                        for ($i = 0 ; $i < $nb_commande ; $i++)
+                        {
+                            print '<tr><td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$coms[$i].'">'.$coms[$i]."</a></td>\n";
+                            print "</tr>\n";
+                        }
+                    }
+                    print "</table>";
+                }
+            }
+
+            /*
+            *
+            * Actions
+            *
+            */
+            if ($obj->statut <> 4 && $user->societe_id == 0)
+            {
+                print '<br><table id="actions" width="100%"><tr>';
+
+                if ($obj->statut == 2 && $user->rights->facture->creer)
+                {
+                    print '<td width="20%">';
+                    print "<a href=\"facture.php?propalid=".$propal->id."&action=create\">Emettre une facture</td>";
+                }
+                else
+                {
+                    print '<td width="20%">-</td>';
+                }
+
+                print '<td width="20%">-</td>';
+                print '<td width="20%">-</td>';
+                print '<td width="20%">-</td>';
+
+                if ($obj->statut == 2 && $num_fac_asso)
+                {
+                    print "<td width=\"20%\">[<a href=\"propal.php?propalid=".$propal->id."&action=setstatut&statut=4\">Facturée</a>]</td>";
+                }
+                else
+                {
+                    print '<td width="20%">-</td>';
+                }
+                print "</tr></table>";
+            }
+
+        } else {
+            print "Num rows = " . $db->num_rows();
+            print "<p><b>$sql";
+        }
+
+        /*
+        * Produits
+        */
+        print_titre("Produits");
+
+        print '<table class="noborder" width="100%">';
+        print "<tr class=\"liste_titre\">";
+        print '<td>'.$langs->trans("Ref").'</td><td>'.$langs->trans("Product").'</td>';
+        print '<td align="right">'.$langs->trans("Price").'</td><td align="center">'.$langs->trans("Discount").'</td><td align="center">'.$langs->trans("Qty").'</td></tr>';
+
+        $sql = "SELECT pt.rowid, p.label as product, p.ref, pt.price, pt.qty, p.rowid as prodid, pt.remise_percent";
+        $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pt, ".MAIN_DB_PREFIX."product as p WHERE pt.fk_product = p.rowid AND pt.fk_propal =".$propal->id;
+        $sql .= " ORDER BY pt.rowid ASC";
+        if ($db->query($sql))
+        {
+            $num = $db->num_rows();
+            $i = 0;
+            $var=True;
+            while ($i < $num)
+            {
+                $objp = $db->fetch_object();
+                $var=!$var;
+                print "<tr $bc[$var]><td>[$objp->ref]</TD>\n";
+                print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->prodid.'">'.$objp->product.'</td>';
+                print "<td align=\"right\">".price($objp->price)."</TD>";
+                print '<td align="center">'.$objp->remise_percent.' %</td>';
+                print "<td align=\"center\">".$objp->qty."</td></tr>\n";
+                $i++;
+            }
+        }
+
+        $sql = "SELECT pt.rowid, pt.description as product,  pt.price, pt.qty, pt.remise_percent";
+        $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pt  WHERE  pt.fk_propal = ".$propal->id." AND pt.fk_product = 0";
+        $sql .= " ORDER BY pt.rowid ASC";
+        if ($db->query($sql))
+        {
+            $num = $db->num_rows();
+            $i = 0;
+            while ($i < $num)
+            {
+                $objp = $db->fetch_object();
+                $var=!$var;
+                print "<tr $bc[$var]><td>&nbsp;</td>\n";
+                print '<td>'.$objp->product.'</td>';
+                print '<td align="right">'.price($objp->price).'</td>';
+                print '<td align="center">'.$objp->remise_percent.' %</td>';
+                print "<td align=\"center\">".$objp->qty."</td></tr>\n";
+                $i++;
+            }
+        }
+        else
+        {
+            print $sql;
+        }
+
+        print '</table>';
+
+
+        /*
+         * Voir le suivi des actions
+         */
+        if ($suivi)
+        {
+            $validor = new User($db, $obj->fk_user_valid);
+            $validor->fetch('');
+            $cloturor = new User($db, $obj->fk_user_cloture);
+            $cloturor->fetch('');
+
+            print '<p><a href="propal.php?propalid='.$propal->id.'">Cacher le suivi des actions </a>';
+            print '<table cellspacing=0 border=1 cellpadding=3>';
+            print '<tr><td>&nbsp;</td><td>Nom</td><td>Date</td></tr>';
+            print '<tr><td>Création</td><td>'.$author->fullname.'</td>';
+            print '<td>'.$obj->datec.'</td></tr>';
+
+            print '<tr><td>Validation</td><td>'.$validor->fullname.'&nbsp;</td>';
+            print '<td>'.$obj->date_valid.'&nbsp;</td></tr>';
+
+            print '<tr><td>Cloture</td><td>'.$cloturor->fullname.'&nbsp;</td>';
+            print '<td>'.$obj->date_cloture.'&nbsp;</td></tr>';
+            print '</table>';
+        }
+        else
+        {
+            print '<p><a href="propal.php?propalid='.$propal->id.'&suivi=1">Voir le suivi des actions </a>';
+        }
 
-      /*
-       *
-       * Actions
-       *
-       */
-      if ($obj->statut <> 4 && $user->societe_id == 0)
-	{  
-	  print '<br><table id="actions" width="100%"><tr>';
-	  
-	  if ($obj->statut == 2 && $user->rights->facture->creer)
-	    {
-	      print '<td width="20%">';
-	      print "<a href=\"facture.php?propalid=".$propal->id."&action=create\">Emettre une facture</td>";
-	    }
-	  else
-	    {
-	      print '<td width="20%">-</td>';
-	    }
-	  
-	  print '<td width="20%">-</td>';
-	  print '<td width="20%">-</td>';
-	  print '<td width="20%">-</td>';
-	  
-	  if ($obj->statut == 2 && $num_fac_asso)
-	    {
-	      print "<td width=\"20%\">[<a href=\"propal.php?propalid=".$propal->id."&action=setstatut&statut=4\">Facturée</a>]</td>";
-	    }
-	  else	
-	    {
-	      print '<td width="20%">-</td>';
-	    }
-	  print "</tr></table>";
-	}
-      /*
-       *
-       */
-      
     } else {
-      print "Num rows = " . $db->num_rows();
-      print "<p><b>$sql";
+        dolibarr_print_error($db);
     }
 
-    /*
-     * Produits
-     */
-    print_titre("Produits");
-    
-    print '<table class="noborder" width="100%">';
-    print "<tr class=\"liste_titre\">";
-    print '<td>'.$langs->trans("Ref").'</td><td>'.$langs->trans("Product").'</td>';
-    print '<td align="right">'.$langs->trans("Price").'</td><td align="center">'.$langs->trans("Discount").'</td><td align="center">'.$langs->trans("Qty").'</td></tr>';
-    
-    $sql = "SELECT pt.rowid, p.label as product, p.ref, pt.price, pt.qty, p.rowid as prodid, pt.remise_percent";
-    $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pt, ".MAIN_DB_PREFIX."product as p WHERE pt.fk_product = p.rowid AND pt.fk_propal =".$propal->id;
-    $sql .= " ORDER BY pt.rowid ASC";
-    if ($db->query($sql)) 
-      {
-	$num = $db->num_rows();
-	$i = 0;	
-	$var=True;	
-	while ($i < $num) 
-	  {
-	    $objp = $db->fetch_object();
-	    $var=!$var;
-	    print "<tr $bc[$var]><td>[$objp->ref]</TD>\n";
-	    print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->prodid.'">'.$objp->product.'</td>';
-	    print "<td align=\"right\">".price($objp->price)."</TD>";
-	    print '<td align="center">'.$objp->remise_percent.' %</td>';
-	    print "<td align=\"center\">".$objp->qty."</td></tr>\n";
-	    $i++;
-	  }
-      }
-
-    $sql = "SELECT pt.rowid, pt.description as product,  pt.price, pt.qty, pt.remise_percent";
-    $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pt  WHERE  pt.fk_propal = ".$propal->id." AND pt.fk_product = 0";
-    $sql .= " ORDER BY pt.rowid ASC";
-    if ($db->query($sql)) 
-      {
-	$num = $db->num_rows();
-	$i = 0;	
-	while ($i < $num) 
-	  {
-	    $objp = $db->fetch_object();
-	    $var=!$var;
-	    print "<tr $bc[$var]><td>&nbsp;</td>\n";
-	    print '<td>'.$objp->product.'</td>';
-	    print '<td align="right">'.price($objp->price).'</td>';
-	    print '<td align="center">'.$objp->remise_percent.' %</td>';
-	    print "<td align=\"center\">".$objp->qty."</td></tr>\n";
-	    $i++;
-	  }
-      }
-    else
-      {
-	print $sql;
-      }
-
-    print '</table>';
-    
-
-    /*
-     * Voir le suivi des actions
-     *
-     *
-     *
-     */
-    if ($suivi)
-      {
-	$validor = new User($db, $obj->fk_user_valid);
-	$validor->fetch('');
-	$cloturor = new User($db, $obj->fk_user_cloture);
-	$cloturor->fetch('');
-	
-	print '<p><a href="propal.php?propalid='.$propal->id.'">Cacher le suivi des actions </a>';
-	print '<table cellspacing=0 border=1 cellpadding=3>';
-	print '<tr><td>&nbsp;</td><td>Nom</td><td>Date</td></tr>';
-	print '<tr><td>Création</td><td>'.$author->fullname.'</td>';
-	print '<td>'.$obj->datec.'</td></tr>';
-	
-	print '<tr><td>Validation</td><td>'.$validor->fullname.'&nbsp;</td>';
-	print '<td>'.$obj->date_valid.'&nbsp;</td></tr>';
-	
-	print '<tr><td>Cloture</td><td>'.$cloturor->fullname.'&nbsp;</td>';
-	print '<td>'.$obj->date_cloture.'&nbsp;</td></tr>';      
-	print '</table>';
-      }
-    else
-      {
-	print '<p><a href="propal.php?propalid='.$propal->id.'&suivi=1">Voir le suivi des actions </a>';
-      }
-    
-  } else {
-    print $db->error();
-    print "<p><b>$sql";
-  }
-  
-
-  /*
-   *
-   *
-   *
-   */
 } else {
-  /*
-   *
-   * Mode Liste des propales
-   *
-   */
 
-  if ($sortfield == "")
+    /**
+     *
+     * Mode Liste des propales
+     *
+     */
+
+    if (! $sortfield) $sortfield="p.datep";
+    if (! $sortorder) $sortorder="DESC";
+    if ($page == -1) $page = 0 ;
+
+    $pageprev = $page - 1;
+    $pagenext = $page + 1;
+    $limit = $conf->liste_limit;
+    $offset = $limit * $page ;
+
+    $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid";
+    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c ";
+    $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND p.fk_statut in(2,4)";
+
+    if ($socidp)
     {
-      $sortfield="p.datep";
-    }
-  if ($sortorder == "")
-    {
-      $sortorder="DESC";
+        $sql .= " AND s.idp = $socidp";
     }
 
-  if ($page == -1)
+    if ($viewstatut <> '')
     {
-      $page = 0 ;
+        $sql .= " AND c.id = $viewstatut";
     }
 
-  $pageprev = $page - 1;
-  $pagenext = $page + 1;
-  $limit = $conf->liste_limit;
-  $offset = $limit * $page ;
-
-  $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid";
-  $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c ";
-  $sql .= " WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND p.fk_statut in(2,4)";
-
-  if ($socidp)
-    { 
-      $sql .= " AND s.idp = $socidp"; 
+    if ($month > 0)
+    {
+        $sql .= " AND date_format(p.datep, '%Y-%m') = '$year-$month'";
     }
 
-  if ($viewstatut <> '')
+    if ($year > 0)
     {
-      $sql .= " AND c.id = $viewstatut"; 
+        $sql .= " AND date_format(p.datep, '%Y') = $year";
     }
 
-  if ($month > 0)
+    $sql .= " ORDER BY $sortfield $sortorder, p.rowid DESC ";
+    $sql .= $db->plimit($limit + 1,$offset);
+
+    if ( $db->query($sql) )
     {
-      $sql .= " AND date_format(p.datep, '%Y-%m') = '$year-$month'";
+        $num = $db->num_rows();
+
+        print_barre_liste("Propositions commerciales", $page, "propal.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
+
+        $i = 0;
+        print "<table class=\"noborder\" width=\"100%\">";
+        print '<tr class="liste_titre">';
+        print_liste_field_titre($langs->trans("Ref"),"propal.php","p.ref","","&year=$year&viewstatut=$viewstatut",'',$sortfield);
+        print_liste_field_titre($langs->trans("Company"),"propal.php","s.nom","&viewstatut=$viewstatut","",'',$sortfield);
+        print_liste_field_titre($langs->trans("Date"),"propal.php","p.datep","&viewstatut=$viewstatut","",'align="right" colspan="2"',$sortfield);
+        print_liste_field_titre($langs->trans("Price"),"propal.php","p.price","&viewstatut=$viewstatut","",'align="right"',$sortfield);
+        print_liste_field_titre($langs->trans("Status"),"propal.php","p.fk_statut","&viewstatut=$viewstatut","",'align="center"',$sortfield);
+        print "</tr>\n";
+
+        while ($i < min($num, $limit))
+        {
+            $objp = $db->fetch_object();
+
+            $var=!$var;
+            print "<tr $bc[$var]>";
+
+            print '<td><a href="propal.php?propalid='.$objp->propalid.'">'.img_object($langs->trans("ShowPropal"),"propal")."</a>&nbsp;\n";
+            print '<a href="propal.php?propalid='.$objp->propalid.'">'.$objp->ref."</a></td>\n";
+
+            print "<td><a href=\"fiche.php?socid=$objp->idp\">$objp->nom</a></td>\n";
+
+            $now = time();
+            $lim = 3600 * 24 * 15 ;
+
+            if ( ($now - $objp->dp) > $lim && $objp->statutid == 1 )
+            {
+                print "<td><b> &gt; 15 jours</b></td>";
+            }
+            else
+            {
+                print "<td>&nbsp;</td>";
+            }
+
+            print "<td align=\"right\">";
+            $y = strftime("%Y",$objp->dp);
+            $m = strftime("%m",$objp->dp);
+
+            print strftime("%d",$objp->dp)."\n";
+            print " <a href=\"propal.php?year=$y&month=$m\">";
+            print strftime("%B",$objp->dp)."</a>\n";
+            print " <a href=\"propal.php?year=$y\">";
+            print strftime("%Y",$objp->dp)."</a></td>\n";
+
+            print "<td align=\"right\">".price($objp->price)."</td>\n";
+            print "<td align=\"center\">$objp->statut</td>\n";
+            print "</tr>\n";
+
+            $i++;
+        }
+
+        print "</table>";
+        $db->free();
     }
-  
-  if ($year > 0)
+    else
     {
-      $sql .= " AND date_format(p.datep, '%Y') = $year";
-    }
-  
-  $sql .= " ORDER BY $sortfield $sortorder, p.rowid DESC ";
-  $sql .= $db->plimit($limit + 1,$offset);
-
-  if ( $db->query($sql) )
-    {
-      $num = $db->num_rows();
-
-      print_barre_liste("Propositions commerciales", $page, "propal.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
-
-      $i = 0;
-      print "<table class=\"noborder\" width=\"100%\">";
-      print '<tr class="liste_titre">';
-      print_liste_field_titre($langs->trans("Ref"),"propal.php","p.ref","","&year=$year&viewstatut=$viewstatut",'',$sortfield);
-      print_liste_field_titre($langs->trans("Company"),"propal.php","s.nom","&viewstatut=$viewstatut","",'',$sortfield);
-      print_liste_field_titre($langs->trans("Date"),"propal.php","p.datep","&viewstatut=$viewstatut","",'align="right" colspan="2"',$sortfield);
-      print_liste_field_titre($langs->trans("Price"),"propal.php","p.price","&viewstatut=$viewstatut","",'align="right"',$sortfield);
-      print_liste_field_titre($langs->trans("Status"),"propal.php","p.fk_statut","&viewstatut=$viewstatut","",'align="center"',$sortfield);
-      print "</tr>\n";
-
-      while ($i < min($num, $limit))
-	{
-	  $objp = $db->fetch_object();
-	
-	  $var=!$var;
-	  print "<tr $bc[$var]>";
-
-	  print '<td><a href="propal.php?propalid='.$objp->propalid.'">'.img_object($langs->trans("ShowPropal"),"propal")."</a>&nbsp;\n";
-	  print '<a href="propal.php?propalid='.$objp->propalid.'">'.$objp->ref."</a></td>\n";
-
-	  print "<td><a href=\"fiche.php?socid=$objp->idp\">$objp->nom</a></td>\n";
-	  
-	  $now = time();
-	  $lim = 3600 * 24 * 15 ;
-	  
-	  if ( ($now - $objp->dp) > $lim && $objp->statutid == 1 )
-	    {
-	      print "<td><b> &gt; 15 jours</b></td>";
-	    }
-	  else
-	    {
-	      print "<td>&nbsp;</td>";
-	    }
-	
-	  print "<td align=\"right\">";
-	  $y = strftime("%Y",$objp->dp);
-	  $m = strftime("%m",$objp->dp);
-	  
-	  print strftime("%d",$objp->dp)."\n";
-	  print " <a href=\"propal.php?year=$y&month=$m\">";
-	  print strftime("%B",$objp->dp)."</a>\n";
-	  print " <a href=\"propal.php?year=$y\">";
-	  print strftime("%Y",$objp->dp)."</a></td>\n";      
-	  
-	  print "<td align=\"right\">".price($objp->price)."</td>\n";
-	  print "<td align=\"center\">$objp->statut</td>\n";
-	  print "</tr>\n";
-	  
-	  $i++;
-	}
-      
-      print "</table>";
-      $db->free();
-    }
-  else
-    {
-      print $db->error();
-      print "<br>$sql";
+        dolibarr_print_error($db);
     }
 }
 $db->close();
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index cb3215341ab..d0bfc26fa83 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -84,5 +84,5 @@ ToBill=
 RemainderToBill=Reste à facturer
 SendBillByMail=Envoyer la facture par mail
 SendReminderBillByMail=Envoyer une relance par mail
-RelatedCommercialProposals=Propositions commercials associées
+RelatedCommercialProposals=Propositions commerciales associées
 MenuToValid=A valider