diff --git a/htdocs/compta/facture.php3 b/htdocs/compta/facture.php3
index eafc7cdfd24..709c2da6b94 100644
--- a/htdocs/compta/facture.php3
+++ b/htdocs/compta/facture.php3
@@ -21,6 +21,7 @@
  */
 require("./pre.inc.php3");
 require("../facture.class.php3");
+require("../lib/CMailFile.class.php3");
 
 llxHeader();
 
@@ -127,6 +128,58 @@ if ($action == 'add')
   $action = '';
   
 }
+/*
+ *
+ */
+
+if ($action == 'send')
+{
+  $fac = new Facture($db,"",$facid);
+  $fac->fetch($facid);
+
+  $soc = new Societe($db, $fac->socidp);
+
+  $file = $conf->facture->outputdir . "/" . $fac->ref . "/" . $fac->ref . ".pdf";
+
+  if (file_exists($file))
+    {
+
+      $sendto = $soc->contact_get_email($HTTP_POST_VARS["destinataire"]);
+
+      if (strlen($sendto))
+	{
+	  
+	  $subject = "Facture $fac->ref";
+	  $message = "Veuillez trouver ci-joint la facture $fac->ref\n\nCordialement\n\n";
+	  $filename = "$fac->ref.pdf";
+	  
+	  $replyto = $HTTP_POST_VARS["replytoname"] . " <".$HTTP_POST_VARS["replytomail"] .">";
+	  
+	  $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$file, "application/pdf", $filename);
+	  
+	  if ( $mailfile->sendfile() )
+	    {
+	      
+	      $sql = "INSERT INTO actioncomm (datea,fk_action,fk_soc,note,fk_facture) VALUES (now(), 9 ,$fac->socidp ,'Envoyée à $sendndto',$fac->id);";
+
+	      if (! $db->query($sql) )
+		{
+		  print $db->error();
+		  print "<p>$sql</p>";
+		}	      	      	      
+	    }
+	  else
+	    {
+	      print "<b>!! erreur d'envoi<br>$sendto<br>$replyto<br>$filename";
+	    }	  
+	}
+      else
+	{
+	  print "Can't get email $sendto";
+	}
+    }
+}
+
 /*
  *
  * Mode creation
@@ -255,6 +308,8 @@ else
 	print $db->error();
       }
 
+    $soc = new Societe($db, $obj->socidp);
+
     $author = new User($db);
     $author->id = $obj->fk_user_author;
     $author->fetch();
@@ -357,9 +412,9 @@ else
 
 	echo '<TABLE border="0" width="100%" cellspacing="0" cellpadding="3">';
 	print "<TR class=\"liste_titre\">";
-	print "<td>Date</td>";
-	print '<td align="center">Quantité</td>';
-	print '<td align="right">Montant</TD><td>&nbsp;</td><td>&nbsp;</td>';
+	print '<td width="60%">Description</td>';
+	print '<td width="8%"align="center">Quantité</td>';
+	print '<td width="12%" align="right">Montant</TD><td width="10%">&nbsp;</td><td width="10%">&nbsp;</td>';
 	print "</TR>\n";
     
 	$var=True;
@@ -375,6 +430,10 @@ else
 	      print '<td align="right"><a href="'.$PHPSELF.'?facid='.$facid.'&action=deleteline&rowid='.$objp->rowid.'">del</a></td>';
 	      print '<td align="right"><a href="'.$PHPSELF.'?facid='.$facid.'&action=editline&rowid='.$objp->rowid.'">edit</a></td>';
 	    }
+	  else
+	    {
+	      print '<td>&nbsp;</td><td>&nbsp;</td>';
+	    }
 	  print "</tr>";
 
 	  if ($action == 'editline' && $rowid == $objp->rowid)
@@ -412,7 +471,7 @@ else
 	print "<form action=\"$PHP_SELF?facid=$facid\" method=\"post\">";
 	echo '<TABLE border="1" width="100%" cellspacing="0" cellpadding="1">';
 	print "<TR class=\"liste_titre\">";
-	print "<td>Date</td>";
+	print "<td>Description</td>";
 	print "<td>Quantité</td>";
 	print "<td align=\"right\">Montant</TD>";
 	print "</TR>\n";
@@ -437,7 +496,11 @@ else
       {
 	print "<td align=\"center\" width=\"25%\">[<a href=\"$PHP_SELF?facid=$facid&action=delete\">Supprimer</a>]</td>";
       } 
-    else 
+    elseif ($obj->statut == 1 && $resteapayer > 0) 
+      {
+	print "<td align=\"center\" width=\"25%\">[<a href=\"$PHP_SELF?facid=$facid&action=presend\">Envoyer</a>]</td>";
+      }
+    else
       {
 	print "<td align=\"center\" width=\"25%\">-</td>";
       } 
@@ -475,16 +538,16 @@ else
      *
      */
     print "<hr>";
-    print "<table width=\"100%\" cellspacing=2><tr><td width=\"50%\" valign=\"top\">";
-    print "<b>Documents générés</b><br>";
-    print "<table width=\"100%\" cellspacing=0 border=1 cellpadding=3>";
+    print "<table width=\"100%\" cellspacing=2><tr><td width=\"60%\" valign=\"top\">";
+    print_titre("Documents générés");
+    print '<table width="100%" cellspacing="0" border="1" cellpadding="3">';
 
     $file = $conf->facture->outputdir . "/" . $obj->facnumber . "/" . $obj->facnumber . ".pdf";
 
 
     if (file_exists($file))
       {
-	print "<tr><td>Propale PDF</a></td>";
+	print "<tr $bc[0]><td>Facture PDF</a></td>";
 	print '<td><a href="'.$conf->facture->outputurl."/".$obj->facnumber."/".$obj->facnumber.'.pdf">'.$obj->facnumber.'.pdf</a></td>';
       print '<td align="right">'.filesize($file). ' bytes</td>';
       print '<td align="right">'.strftime("%d %b %Y %H:%M:%S",filemtime($file)).'</td>';
@@ -495,17 +558,65 @@ else
 
     if (file_exists($file))
       {
-	print "<tr><td>Propale Postscript</a></td>";
+	print "<tr $bc[0]><td>Facture Postscript</a></td>";
 	print '<td><a href="'.$conf->facture->outputurl."/".$obj->facnumber."/".$obj->facnumber.'.ps">'.$obj->facnumber.'.ps</a></td>';
-      print '<td align="right">'.filesize($file). ' bytes</td>';
-      print '<td align="right">'.strftime("%d %b %Y %H:%M:%S",filemtime($file)).'</td>';
-      print '</tr>';
+	print '<td align="right">'.filesize($file). ' bytes</td>';
+	print '<td align="right">'.strftime("%d %b %Y %H:%M:%S",filemtime($file)).'</td>';
+	print '</tr>';
 
 
       }
-    print '<tr><td colspan="2">(<a href="'.$conf->facture->outputurl.'/'.$facid.'/">liste...</a>)</td></tr>';  
+    print '<tr $bc[0]><td colspan="4">(<a href="'.$conf->facture->outputurl.'/'.$facid.'/">liste...</a>)</td></tr>';  
 
-    print "</table>\n</table>";
+    print "</table>\n";
+    print "</td>";
+    print '<td valign="top" width="40%">';
+    print_titre("Actions");
+    /*
+     * Liste des actions
+     *
+     */
+    $sql = "SELECT ".$db->pdate("a.datea")." as da,  a.note";
+    $sql .= " FROM actioncomm as a WHERE a.fk_soc = $obj->socidp AND a.fk_action = 9 AND a.fk_facture = $facid";
+  
+    $result = $db->query($sql);
+    if ($result)
+      {
+	$num = $db->num_rows();
+	if ($num)
+	  {
+	    $i = 0; $total = 0;
+	    print '<TABLE border="1" cellspacing="0" cellpadding="4">';
+	    print "<TR $bc[$var]>";
+	    print "<td>Date</td>";
+	    print "<td>Action</td>";
+	    print "</TR>\n";
+	    
+	    $var=True;
+	    while ($i < $num)
+	      {
+		$objp = $db->fetch_object( $i);
+		$var=!$var;
+		print "<TR $bc[$var]>";
+		print "<TD>".strftime("%d %B %Y",$objp->da)."</TD>\n";
+		print '<TD align="right">'.stripslashes($objp->note).'</TD>';
+		print "</tr>";
+		$i++;
+	      }
+	    print "</table>";
+	  }
+      }
+    else
+      {
+	print $db->error();
+      }
+
+    /*
+     *
+     *
+     */
+    print "</td></tr>";
+    print "</table>";
   
     /*
      * Generation de la facture
@@ -513,7 +624,7 @@ else
      */
     if ($action == 'pdf')
       {
-	print "<hr><b>Génération de la facture</b><br>";
+	print "<hr><b>Génération de la facture</b><br><small><pre>";
 	$command = "export DBI_DSN=\"dbi:mysql:dbname=".$conf->db->name."\" ";
 	$command .= " ; ./texfacture.pl --html -vv --facture=$facid --pdf --output=".$conf->facture->outputdir;
 	$command .= " --templates=".$conf->facture->templatesdir;
@@ -521,8 +632,47 @@ else
 	$output = system($command);
 	print "<p>command :<br><small>$command</small><br>";
 	//print "<p>output :<br><small>$output</small><br>";
+	print "</pre></small>";
       } 
+    /*
+     *
+     *
+     */
+    if ($action == 'presend')
+      {
+	$replytoname = "R. Quiedeville"; 
+	$from_name = $replytoname;
+	$replytomail = "rq@quiedeville.org"; 
+	$from_mail = $replytomail;
+	
+	print "<form method=\"post\" action=\"$PHP_SELF?facid=$facid&action=send\">\n";
+	print "<input type=\"hidden\" name=\"replytoname\" value=\"$replytoname\">\n";
+	print "<input type=\"hidden\" name=\"replytomail\" value=\"$replytomail\">\n";
+	
+	print "<p><b>Envoyer la facture par mail</b>";
+	print "<table cellspacing=0 border=1 cellpadding=3>";
+	print '<tr><td>Destinataire</td><td colspan="5">';
 
+	$form = new Form($db);
+
+	$form->select_array("destinataire",$soc->contact_email_array());
+
+	print '</td>';
+	print "<td><input size=\"30\" name=\"sendto\" value=\"$obj->email\"></td></tr>";
+	print "<tr><td>Expéditeur</td><td colspan=\"5\">$from_name</td><td>$from_mail</td></tr>";
+	print "<tr><td>Reply-to</td><td colspan=\"5\">$replytoname</td>";
+	print "<td>$replytomail</td></tr>";
+	
+	print "</table>";
+	print "<input type=\"submit\" value=\"Envoyer\">";
+	print "</form>";
+      }
+
+    /*
+     *
+     *
+     */
+    
 
     /*
      *   Propales
diff --git a/htdocs/compta/fiche.php3 b/htdocs/compta/fiche.php3
index 790361d0c8b..c22850092df 100644
--- a/htdocs/compta/fiche.php3
+++ b/htdocs/compta/fiche.php3
@@ -306,7 +306,7 @@ if ($socid > 0) {
       print "<tr><td><b>Pr&eacute;nom Nom</b></td>";
       print '<td><b>Poste</b></td><td><b>T&eacute;l</b></td>';
       print "<td><b>Fax</b></td><td><b>Email</b></td>";
-      print "<td><a href=\"people.php3?socid=$objsoc->idp&action=addcontact\">Ajouter</a></td></tr>";
+      print "<td><a href=\"../comm/people.php3?socid=$objsoc->idp&action=addcontact\">Ajouter</a></td></tr>";
     
       $sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note FROM socpeople as p WHERE p.fk_soc = $objsoc->idp  ORDER by p.datec";
       $result = $db->query($sql);
@@ -331,7 +331,7 @@ if ($socid > 0) {
 	print '<td><a href="action/fiche.php3?action=create&actionid=1&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->phone.'</a>&nbsp;</td>';
 	print '<td><a href="action/fiche.php3?action=create&actionid=2&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->fax.'</a>&nbsp;</td>';
 	print '<td><a href="action/fiche.php3?action=create&actionid=4&contactid='.$obj->idp.'&socid='.$objsoc->idp.'">'.$obj->email.'</a>&nbsp;</td>';
-	print "<td><a href=\"people.php3?socid=$objsoc->idp&action=editcontact&contactid=$obj->idp\">Modifier</a></td>";
+	print "<td><a href=\"../comm/people.php3?socid=$objsoc->idp&action=editcontact&contactid=$obj->idp\">Modifier</a></td>";
 	print "</tr>\n";
 	$i++;
 	$tag = !$tag;
diff --git a/htdocs/compta/index.php3 b/htdocs/compta/index.php3
index 241163ed2ed..744202e25d0 100644
--- a/htdocs/compta/index.php3
+++ b/htdocs/compta/index.php3
@@ -52,12 +52,15 @@ if ($action == 'del_bookmark') {
   $sql = "DELETE FROM llx_bookmark WHERE rowid=$bid";
   $result = $db->query($sql);
 }
-
+/*
+ *
+ *
+ */
 print_titre(translate("Espace compta"));
 
 print '<TABLE border="0" width="100%" cellspacing="0" cellpadding="4">';
 
-print '<tr><td valign="top" width="30%">';
+print '<tr><td valign="top" width="33%">';
 /*
  * Charges a payer
  *
@@ -163,7 +166,7 @@ if ( $db->query($sql) ) {
  *
  *
  */
-print '</td><td valign="top" width="70%">';
+print '</td><td valign="top" width="33%">';
 
 
 $result = 0;
@@ -187,9 +190,49 @@ if ( $result ) {
 } else {
   print $db->error();
 }
+/*
+ *
+ *
+ */
 
+/*
+ * Charges a payer
+ *
+ */
+$sql = "SELECT ff.amount, ff.libelle";
+$sql .= " FROM llx_facture_fourn as ff";
+$sql .= " WHERE ff.paye=0";
 
-print '</td></tr>';
+if ( $db->query($sql) ) 
+{
+  $num = $db->num_rows();
+  if ($num)
+    {
+      print '<table border="0" width="100%" cellspacing="0" cellpadding="4">';
+      print '<TR class="liste_titre">';
+      print '<TD colspan="2">Charges à payer</td>';
+      print "</TR>\n";
+      $i = 0;
+      
+      while ($i < $num)
+	{
+	  $obj = $db->fetch_object( $i);
+	  $var = !$var;
+	  print "<tr $bc[$var]>";
+	  print '<td>'.$obj->libelle.'</td>';
+	  print '<td align="right">'.price($obj->amount).'</td>';
+	  print '</tr>';
+	  $i++;
+	}
+      print '</table><br>';
+    }
+}
+else
+{
+  print $db->error();
+}
+
+print '</td><td width="40%">&nbsp;</td></tr>';
 
 print '</table>';
 
diff --git a/htdocs/facture.class.php3 b/htdocs/facture.class.php3
index d512a37ccaf..34a400420b5 100644
--- a/htdocs/facture.class.php3
+++ b/htdocs/facture.class.php3
@@ -110,7 +110,7 @@ class Facture {
   Function fetch($rowid)
     {
 
-      $sql = "SELECT ref,price,remise,".$this->db->pdate(datep)."as dp FROM llx_facture WHERE rowid=$rowid;";
+      $sql = "SELECT fk_soc,facnumber,amount,remise,".$this->db->pdate(datef)."as df FROM llx_facture WHERE rowid=$rowid;";
       
       if ($this->db->query($sql) )
 	{
@@ -118,11 +118,12 @@ class Facture {
 	    {
 	      $obj = $this->db->fetch_object(0);
 	      
-	      $this->id = $rowid;
-	      $this->datep = $obj->dp;
-	      $this->ref = $obj->ref;
-	      $this->price = $obj->price;
+	      $this->id     = $rowid;
+	      $this->datep  = $obj->dp;
+	      $this->ref    = $obj->facnumber;
+
 	      $this->remise = $obj->remise;
+	      $this->socidp = $obj->fk_soc;
 	      
 	      $this->db->free();
 	    }
diff --git a/htdocs/fourn/facture/index.php3 b/htdocs/fourn/facture/index.php3
index e4163e33c80..42babfe10df 100644
--- a/htdocs/fourn/facture/index.php3
+++ b/htdocs/fourn/facture/index.php3
@@ -25,12 +25,6 @@ require("../../contact.class.php3");
 
 llxHeader();
 $db = new Db();
-if ($sortorder == "") {
-  $sortorder="ASC";
-}
-if ($sortfield == "") {
-  $sortfield="nom";
-}
 
 if ($action == 'note') {
   $sql = "UPDATE societe SET note='$note' WHERE idp=$socid";
@@ -116,11 +110,21 @@ if ($socid > 0) {
    */
   print_barre_liste("Liste des factures fournisseurs", $page, $PHP_SELF);
 
+  if ($sortorder == "")
+    {
+      $sortorder="ASC";
+    }
+  if ($sortfield == "")
+    {
+      $sortfield="fac.paye";
+    }
+
+
   $sql = "SELECT s.idp as socid, s.nom, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea,  s.prefix_comm, fac.amount, fac.paye, fac.libelle, ".$db->pdate("fac.datef")." as datef, fac.rowid as facid";
   $sql .= " FROM societe as s, llx_facture_fourn as fac ";
   $sql .= " WHERE fac.fk_soc = s.idp";
 
-  //  $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit, $offset);
+  $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit, $offset);
 
   $result = $db->query($sql);
 
@@ -128,17 +132,18 @@ if ($socid > 0) {
     $num = $db->num_rows();
     $i = 0;
 
-    if ($sortorder == "DESC") {
-      $sortorder="ASC";
-    } else {
-      $sortorder="DESC";
-    }
+    if ($sortorder == "DESC")
+      {
+	$sortorder="ASC";
+      } else {
+	$sortorder="DESC";
+      }
     print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
     print '<TR class="liste_titre">';
     print "<TD>Libelle</TD><td>";
     print_liste_field_titre("Société",$PHP_SELF,"s.nom");
-    print "</td><TD>Montant</TD>";
-    print "<td colspan=\"2\">&nbsp;</td>";
+    print '</td><TD align="right">Montant</TD>';
+    print '<td align="center">Payé</td>';
     print "</TR>\n";
     $var=True;
     while ($i < $num) {
@@ -151,7 +156,7 @@ if ($socid > 0) {
       print "<TD><a href=\"../fiche.php3?socid=$obj->socid\">$obj->nom</A></td>\n";
       print '<TD align="right">'.price($obj->amount).'</TD>';
 
-      print "<TD align=\"center\">$obj->prefix_comm&nbsp;</TD>\n";
+      print '<TD align="center">'.$yn[$obj->paye].'</TD>';
 
 
       print "</TR>\n";
diff --git a/htdocs/societe.class.php3 b/htdocs/societe.class.php3
index f2d0226b8f4..636594bf49e 100644
--- a/htdocs/societe.class.php3
+++ b/htdocs/societe.class.php3
@@ -71,26 +71,27 @@ class Societe {
    *
    *
    */
-  Function update($id) {
+  Function update($id)
+    {
 
-    $sql = "UPDATE societe ";
-    $sql .= " SET nom = '" . trim($this->nom) ."'";
-    $sql .= ",address = '" . trim($this->adresse) ."'";
-    $sql .= ",cp = '" . trim($this->cp) ."'";
-    $sql .= ",ville = '" . trim($this->ville) ."'";
-    $sql .= ",tel = '" . trim($this->tel) ."'";
-    $sql .= ",fax = '" . trim($this->fax) ."'";
-    $sql .= ",url = '" . trim($this->url) ."'";
-    $sql .= ",siren = '" . trim($this->siren) ."'";
-    $sql .= ",client = " . $this->client ;
-    $sql .= ",fournisseur = " . $this->fournisseur ;
-    $sql .= " WHERE idp = " . $id .";";
-
-    if (! $this->db->query($sql)) 
+      $sql = "UPDATE societe ";
+      $sql .= " SET nom = '" . trim($this->nom) ."'";
+      $sql .= ",address = '" . trim($this->adresse) ."'";
+      $sql .= ",cp = '" . trim($this->cp) ."'";
+      $sql .= ",ville = '" . trim($this->ville) ."'";
+      $sql .= ",tel = '" . trim($this->tel) ."'";
+      $sql .= ",fax = '" . trim($this->fax) ."'";
+      $sql .= ",url = '" . trim($this->url) ."'";
+      $sql .= ",siren = '" . trim($this->siren) ."'";
+      $sql .= ",client = " . $this->client ;
+      $sql .= ",fournisseur = " . $this->fournisseur ;
+      $sql .= " WHERE idp = " . $id .";";
+      
+      if (! $this->db->query($sql)) 
       {
 	print $this->db->error();
       }
-  }
+    }
   /*
    *
    *
@@ -214,7 +215,69 @@ class Societe {
 	$this->db->free();
       }
   }
+  /*
+   *
+   *
+   */
+  Function contact_email_array()
+    {
+      $contact_email = array();
 
+      $sql = "SELECT idp, email, name, firstname FROM socpeople WHERE fk_soc = $this->id";
+      
+      if ($this->db->query($sql) )
+	{
+	  $nump = $this->db->num_rows();
+
+	  if ($nump)
+	    {
+	      $i = 0;
+	      while ($i < $nump)
+		{
+		  $obj = $this->db->fetch_object($i);
+	      
+		  $contact_email[$obj->idp] = "$obj->firstname $obj->name &lt;$obj->email&gt;";
+		  $i++;
+		}
+	    }
+	  return $contact_email;
+	}
+      else
+	{
+	  print $this->db->error();
+	}
+      
+    }
+  /*
+   *
+   *
+   */
+  Function contact_get_email($rowid)
+    {
+
+      $sql = "SELECT idp, email, name, firstname FROM socpeople WHERE idp = $rowid";
+      
+      if ($this->db->query($sql) )
+	{
+	  $nump = $this->db->num_rows();
+
+	  if ($nump)
+	    {
+	      
+	      $obj = $this->db->fetch_object(0);
+	      
+	      $contact_email = "$obj->firstname $obj->name <$obj->email>";
+
+	    }
+	  return $contact_email;
+	}
+      else
+	{
+	  print $this->db->error();
+	  print "<p>$rowid";
+	}
+      
+    }
 
 }