diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index 40452a4bab6..5652bf0e589 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -216,7 +216,7 @@ if ($_GET["action"] == 'create')
       for ($i = 1 ; $i <= PROPALE_NEW_FORM_NB_PRODUCT ; $i++)
         {
           print '<tr><td>';
-          $html->select_produits("idprod".$id);
+          $html->select_produits('',"idprod".$i);
           print '</td>';
           print '<td><input type="text" size="2" name="qty'.$i.'" value="1"></td>';
           print '<td><input type="text" size="3" name="remise'.$i.'" value="'.$soc->remise_client.'"> %</td></tr>';
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 6aa8f863637..751ce7de019 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1,534 +1,534 @@
-<?php
-/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * 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/commande/fiche.php
-       \ingroup    commande
-       \brief      Fiche commande
-       \version    $Revision$
-*/
-
-require("./pre.inc.php");
-
-$langs->load("orders");
-$langs->load("sendings");
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("propal");
-
-$user->getrights('commande');
-$user->getrights('expedition');
-
-if (!$user->rights->commande->lire) accessforbidden();
-
-require_once(DOL_DOCUMENT_ROOT."/project.class.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
-require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
-
-// Sécurité accés client
-if ($user->societe_id > 0) 
-{
-  $action = '';
-  $socidp = $user->societe_id;
-}
-
-
-/*
- * Actions
- */	
-if ($_POST["action"] == 'classin' && $user->rights->commande->creer)
-{
-  $commande = new Commande($db);
-  $commande->fetch($_GET["id"]);
-  $commande->classin($_POST["projetid"]);
-}
-/*
- *
- */	
-if ($_POST["action"] == 'add' && $user->rights->commande->creer) 
-{
-  $datecommande = mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); 
-
-  $commande = new Commande($db);
-
-  $commande->soc_id         = $_POST["soc_id"];
-  $commande->date_commande  = $datecommande;      
-  $commande->note           = $_POST["note"];
-  $commande->source         = $_POST["source_id"];
-  $commande->projetid       = $_POST["projetid"];
-  $commande->remise_percent = $_POST["remise_percent"];
-  
-  $commande->add_product($_POST["idprod1"],$_POST["qty1"],$_POST["remise_percent1"]);
-  $commande->add_product($_POST["idprod2"],$_POST["qty2"],$_POST["remise_percent2"]);
-  $commande->add_product($_POST["idprod3"],$_POST["qty3"],$_POST["remise_percent3"]);
-  $commande->add_product($_POST["idprod4"],$_POST["qty4"],$_POST["remise_percent4"]);
-  
-  $commande_id = $commande->create($user);
-  
-  $_GET["id"] = $commande->id;
-
-  $action = '';  
-}
-
-/*
- *
- */
-
-if ($_POST["action"] == 'setremise' && $user->rights->commande->creer) 
-{
-  $commande = new Commande($db);
-  $commande->fetch($_GET["id"]);
-
-  $commande->set_remise($user, $_POST["remise"]);
-} 
-
-if ($_POST["action"] == 'setnote' && $user->rights->commande->creer)
-{
-  $commande = new Commande($db);
-  $commande->fetch($_GET['id']);
-  $commande->set_note($user, $_POST['note']);
-}
-
-if ($_POST["action"] == 'addligne' && $user->rights->commande->creer) 
-{
+<?php
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * 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/commande/fiche.php
+       \ingroup    commande
+       \brief      Fiche commande
+       \version    $Revision$
+*/
+
+require("./pre.inc.php");
+
+$langs->load("orders");
+$langs->load("sendings");
+$langs->load("companies");
+$langs->load("bills");
+$langs->load("propal");
+
+$user->getrights('commande');
+$user->getrights('expedition');
+
+if (!$user->rights->commande->lire) accessforbidden();
+
+require_once(DOL_DOCUMENT_ROOT."/project.class.php");
+require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
+
+// Sécurité accés client
+if ($user->societe_id > 0) 
+{
+  $action = '';
+  $socidp = $user->societe_id;
+}
+
+
+/*
+ * Actions
+ */	
+if ($_POST["action"] == 'classin' && $user->rights->commande->creer)
+{
+  $commande = new Commande($db);
+  $commande->fetch($_GET["id"]);
+  $commande->classin($_POST["projetid"]);
+}
+/*
+ *
+ */	
+if ($_POST["action"] == 'add' && $user->rights->commande->creer) 
+{
+  $datecommande = mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); 
+
+  $commande = new Commande($db);
+
+  $commande->soc_id         = $_POST["soc_id"];
+  $commande->date_commande  = $datecommande;      
+  $commande->note           = $_POST["note"];
+  $commande->source         = $_POST["source_id"];
+  $commande->projetid       = $_POST["projetid"];
+  $commande->remise_percent = $_POST["remise_percent"];
+  
+  $commande->add_product($_POST["idprod1"],$_POST["qty1"],$_POST["remise_percent1"]);
+  $commande->add_product($_POST["idprod2"],$_POST["qty2"],$_POST["remise_percent2"]);
+  $commande->add_product($_POST["idprod3"],$_POST["qty3"],$_POST["remise_percent3"]);
+  $commande->add_product($_POST["idprod4"],$_POST["qty4"],$_POST["remise_percent4"]);
+  
+  $commande_id = $commande->create($user);
+  
+  $_GET["id"] = $commande->id;
+
+  $action = '';  
+}
+
+/*
+ *
+ */
+
+if ($_POST["action"] == 'setremise' && $user->rights->commande->creer) 
+{
+  $commande = new Commande($db);
+  $commande->fetch($_GET["id"]);
+
+  $commande->set_remise($user, $_POST["remise"]);
+} 
+
+if ($_POST["action"] == 'setnote' && $user->rights->commande->creer)
+{
+  $commande = new Commande($db);
+  $commande->fetch($_GET['id']);
+  $commande->set_note($user, $_POST['note']);
+}
+
+if ($_POST["action"] == 'addligne' && $user->rights->commande->creer) 
+{
     /*
      *  Ajout d'une ligne produit dans la commande
      */
-    $commande = new Commande($db);
-    $ret=$commande->fetch($_POST["id"]);
-    
-    if (isset($_POST["p_idprod"]))
-    {
-        $result = $commande->addline(
-        $_POST["np_desc"],
-        $_POST["pu"],
-        $_POST["pqty"],
-        $_POST["tva_tx"],
-        $_POST["p_idprod"],
-        $_POST["premise"]);
-    }
-    else
-    {
-        $result = $commande->addline(
-        $_POST["desc"],
-        $_POST["pu"],
-        $_POST["qty"],
-        $_POST["tva_tx"],
-        0,
-        $_POST["remise_percent"]);
-    }
-
-}
-
-if ($_POST["action"] == 'updateligne' && $user->rights->commande->creer) 
-{
-  $commande = new Commande($db,"",$_GET["id"]);
-  if ($commande->fetch($_GET["id"]) )
-    {
-      $result = $commande->update_line($_POST["elrowid"],
-				       $_POST["eldesc"],
-				       $_POST["elprice"],
-				       $_POST["elqty"],
-				       $_POST["elremise_percent"]);
-    }
-  else
-    {
-      print "Erreur";
-    }
-}
-
-if ($_GET["action"] == 'deleteline' && $user->rights->commande->creer) 
-{
-  $commande = new Commande($db);
-  $commande->fetch($_GET["id"]);
-  $result = $commande->delete_line($_GET["lineid"]);
-  Header("Location: fiche.php?id=".$_GET["id"]);
-}
-
-if ($_POST["action"] == 'confirm_valid' && $_POST["confirm"] == 'yes' && $user->rights->commande->valider)
-{
-  $commande = new Commande($db);
-  $commande->fetch($_GET["id"]);
-  $soc = new Societe($db);
-  $soc->fetch($commande->soc_id);
-  $result = $commande->valid($user);
-}
-
-if ($_POST["action"] == 'confirm_close' && $_POST["confirm"] == 'yes' && $user->rights->commande->creer)
-{
-  $commande = new Commande($db);
-  $commande->fetch($_GET["id"]);
-  $result = $commande->cloture($user);
-}
-
-if ($_POST["action"] == 'confirm_cancel' && $_POST["confirm"] == 'yes' && $user->rights->commande->valider)
-{
-  $commande = new Commande($db);
-  $commande->fetch($_GET["id"]);
-  $result = $commande->cancel($user);
-}
-
-if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
-{
-  if ($user->rights->commande->supprimer ) 
-    {
-      $commande = new Commande($db);
-      $commande->id = $_GET["id"];
-      $commande->delete();
-      Header("Location: index.php");
-    }
-}
-
-if ($_GET["action"] == 'pdf')
-{
-  /*
-   * Generation de la commande
-   * définit dans /includes/modules/commande/modules_commande.php
-   */
-  commande_pdf_create($db, $_GET["id"]);
-} 
-
-
-llxHeader('',$langs->trans("OrderCard"),"Commande");
-
-
-
-$html = new Form($db);
-
-/*********************************************************************
- *
- * Mode creation
- *
- *********************************************************************/
-if ($_GET["action"] == 'create' && $user->rights->commande->creer) 
-{
-  print_titre($langs->trans("CreateOrder"));
-
-  $new_commande = new Commande($db);
-
-  if ($propalid)
-    {
-      $sql = "SELECT s.nom, s.prefix_comm, s.idp, p.price, p.remise, p.remise_percent, p.tva, p.total, p.ref, ".$db->pdate("p.datep")." as dp, c.id as statut, c.label as lst";
-      $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";      
-      $sql .= " AND p.rowid = $propalid";
-    }
-  else
-    {
-      $sql = "SELECT s.nom, s.prefix_comm, s.idp ";
-      $sql .= "FROM ".MAIN_DB_PREFIX."societe as s ";
-      $sql .= "WHERE s.idp = ".$_GET["socidp"];      
-    }
-
-  $resql = $db->query($sql);
-
-  if ( $resql ) 
-    {
-      $num = $db->num_rows($resql);
-      if ($num)
-	{
-	  $obj = $db->fetch_object($resql);
-
-	  $soc = new Societe($db);
-	  $soc->fetch($obj->idp);
-       
-	  print '<form action="fiche.php" method="post">';
-	  print '<input type="hidden" name="action" value="add">';
-	  print '<input type="hidden" name="soc_id" value="'.$soc->id.'">' ."\n";
-	  print '<input type="hidden" name="remise_percent" value="0">';
-	  print '<input name="facnumber" type="hidden" value="provisoire">';
-
-	  print '<table class="border" width="100%">';
-	  
-	  print '<tr><td>'.$langs->trans("Ref").' :</td><td>Provisoire</td>';
-	  print '<td>'.$langs->trans("Comments").' :</td></tr>';
-
-	  $nbrow=3;
-	  if ($conf->projet->enabled) $nbrow++;
-	  print '<tr><td>'.$langs->trans("Customer").' :</td><td>'.$soc->nom_url.'</td><td rowspan="'.$nbrow.'">';
-	  print '<textarea name="note" wrap="soft" cols="50" rows="4"></textarea></td></tr>';	
-
-	  print '<tr><td>'.$langs->trans("Date").' :</td><td>';
-	  $html->select_date();
-	  print "</td></tr>";
-
-	  if ($conf->projet->enabled)
-	  {
-    	  print '<tr><td>'.$langs->trans("Project").' :</td><td>';
-    	  $html->select_projects($soc->id,'','projetid');
-    	  print "</td></tr>";
-      }
-      
-	  print '<tr><td>'.$langs->trans("Source").' :</td><td>';
-	  $html->select_array("source_id",$new_commande->sources,2);
-	  print "</td></tr>";
-
-	  if ($propalid > 0)
-	    {
-	      $amount = ($obj->price);
-	      print '<input type="hidden" name="amount"   value="'.$amount.'">'."\n";
-	      print '<input type="hidden" name="total"    value="'.$obj->total.'">'."\n";
-	      print '<input type="hidden" name="remise"   value="'.$obj->remise.'">'."\n";
-	      print '<input type="hidden" name="remise_percent"   value="'.$obj->remise_percent.'">'."\n";
-	      print '<input type="hidden" name="tva"      value="'.$obj->tva.'">'."\n";
-	      print '<input type="hidden" name="propalid" value="'.$propalid.'">';
-	      
-	      print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2">'.$obj->ref.'</td></tr>';
-	      print '<tr><td>'.$langs->trans("TotalTTC").'</td><td colspan="2">'.price($amount).'</td></tr>';
-	      print '<tr><td>'.$langs->trans("VAT").'</td><td colspan="2">'.price($obj->tva)."</td></tr>";
-	      print '<tr><td>'.$langs->trans("TotalTTC").'</td><td colspan="2">'.price($obj->total)."</td></tr>";
-	    }	  
-	  else
-	    {
-	      /*
-	       * Services/produits prédéfinis
-	       */
-	      $NBLINES=8;
-
-	      print '<tr><td colspan="3">'.$langs->trans("Services").'/'.$langs->trans("Products").'</td></tr>';
-	      print '<tr><td colspan="3">';
-
-	      
-	      print '<table class="noborder">';
-	      print '<tr><td>'.$langs->trans("ProductsAndServices").'</td><td>'.$langs->trans("Qty").'</td><td>'.$langs->trans("Discount").'</td></tr>';
-	      for ($i = 1 ; $i <= $NBLINES ; $i++)
-		{
-		  print '<tr><td>';
-          print $html->select_produits('','idprod');
-		  print '</td>';
-		  print '<td><input type="text" size="3" name="qty'.$i.'" value="1"></td>';
-		  print '<td><input type="text" size="3" name="remise_percent'.$i.'" value="0">%</td></tr>';
-		}	      	      
-
-	      print '</table>';
-	      print '</td></tr>';
-	    }
-
-	  /*
-	   *
-	   */	  
-	  print '<tr><td colspan="3" align="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></td></tr>';
-	  print "</form>\n";
-	  print "</table>\n";
-
-	  if ($propalid)
-	    {
-	      /*
-	       * Produits
-	       */
-	      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>';
-	      
-		  $var=false;	
-
-	      $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 = $propalid";
-	      $sql .= " ORDER BY pt.rowid ASC";
-	      $result = $db->query($sql);
-	      if ($result) 
-		{
-		  $num = $db->num_rows($result);
-		  $i = 0;	
-		  while ($i < $num) 
-		    {
-		      $objp = $db->fetch_object($result);
-		      $var=!$var;
-		      print "<tr $bc[$var]><td>[$objp->ref]</td>\n";
-		      print '<td>'.img_object($langs->trans("ShowProduct"),"product").' '.$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 = $propalid 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>'.img_object($langs->trans("ShowProduct"),"product").' '.$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
-		{
-		  dolibarr_print_error($db);
-		}
-
-	      print '</table>';
-	    }	  
-	}
-    } 
-  else 
-    {
-      dolibarr_print_error($db);
-    }
-} 
-else 
-/* *************************************************************************** */
-/*                                                                             */
-/* Mode vue et edition                                                         */
-/*                                                                             */
-/* *************************************************************************** */
-{  
-  $id = $_GET["id"];
-  if ($id > 0)
-    {
-      $commande = new Commande($db);
-      if ( $commande->fetch($_GET["id"]) > 0)
-	{	  
-	  $soc = new Societe($db);
-	  $soc->fetch($commande->soc_id);
-	  $author = new User($db);
-	  $author->id = $commande->user_author_id;
-	  $author->fetch();
-
-	  $h=0;
-
-	  if ($conf->commande->enabled && $user->rights->commande->lire)
-	    {
-    	  $head[$h][0] = DOL_URL_ROOT.'/commande/fiche.php?id='.$commande->id;
-    	  $head[$h][1] = $langs->trans("OrderCard");
-    	  $hselected = $h;
-    	  $h++;
-        }
-        	 
-	  if ($conf->expedition->enabled && $user->rights->expedition->lire)
-	    {
-	      $head[$h][0] = DOL_URL_ROOT.'/expedition/commande.php?id='.$commande->id;
-	      $head[$h][1] = $langs->trans("SendingCard");
-	      $h++;
-	    }
-
-	  if ($conf->compta->enabled)
-	    {
-    	  $head[$h][0] = DOL_URL_ROOT.'/compta/commande/fiche.php?id='.$commande->id;
-    	  $head[$h][1] = $langs->trans("ComptaCard");
-    	  $h++;
-        }
-        
-      $head[$h][0] = DOL_URL_ROOT.'/commande/info.php?id='.$commande->id;
-      $head[$h][1] = $langs->trans("Info");
-      $h++;
-
-	  dolibarr_fiche_head($head, $hselected, $langs->trans("Order").": $commande->ref");
-
-	  /*
-	   * Confirmation de la suppression de la commande
-	   */
-	  if ($_GET["action"] == 'delete')
-	    {
-	      $html->form_confirm("fiche.php?id=$id",$langs->trans("DeleteOrder"),$langs->trans("ConfirmDeleteOrder"),"confirm_delete");
-	      print "<br />\n";
-	    }
-	  
-	  /*
-	   * Confirmation de la validation
-	   */
-	  if ($_GET["action"] == 'valid')
-	    {
-	      //$numfa = commande_get_num($soc);
-	      $html->form_confirm("fiche.php?id=$id",$langs->trans("ValidateOrder"),$langs->trans("ConfirmValidateOrder"),"confirm_valid");
-	      print "<br />\n";
-	    }
-
-	  /*
-	   * Confirmation de la cloture
-	   */
-	  if ($_GET["action"] == 'cloture')
-	    {
-	      //$numfa = commande_get_num($soc);
-	      $html->form_confirm("fiche.php?id=$id",$langs->trans("CloseOrder"),$langs->trans("ConfirmCloseOrder"),"confirm_close");
-	      print "<br />\n";
-	    }
-
-	  /*
-	   * Confirmation de l'annulation
-	   */
-	  if ($_GET["action"] == 'annuler')
-	    {
-	      $html->form_confirm("fiche.php?id=$id",$langs->trans("Cancel"),$langs->trans("ConfirmCancel"),"confirm_cancel");
-	      print "<br />\n";
-	    }
-
-	  /*
-	   *   Commande
-	   */
-	  print '<table class="border" width="100%">';
-	  print '<tr><td width="15%">'.$langs->trans("Ref")."</td>";
-	  print '<td colspan="2">'.$commande->ref.'</td>';
-	  print '<td>'.$langs->trans("Source").' : ' . $commande->sources[$commande->source] ;
-	  if ($commande->source == 0)
-	    {
-	      /* Propale */
-	      $propal = new Propal($db);
-	      $propal->fetch($commande->propale_id);
-	      print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.$propal->ref.'</a>';
-	    }
-	  print "</td></tr>";
-
-	  print "<tr><td>".$langs->trans("Customer")."</td>";
-	  print '<td colspan="3">';
-	  print '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
-	  print '</tr>';
-	  
-	  print '<tr><td>'.$langs->trans("Status").'</td>';
-	  print "<td colspan=\"2\">".$commande->statuts[$commande->statut]."</td>\n";
-        $nbrow=6;
-        if ($conf->projet->enabled) $nbrow++;
-        print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans("Note").' :<br>';
-        if ($commande->brouillon == 1 && $user->rights->commande->creer) 
-        {
-        	print '<form action="fiche.php?id='.$id.'" method="post">';
-        	print '<input type="hidden" name="action" value="setnote">';
-        	print '<textarea name="note" style="width:95%;height:"80%">'.$commande->note.'</textarea><br>';
-        	print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'"></center>';
-        	print '</form>';
-        }
-        else
-        {
-        	print nl2br($commande->note);
-        }
-        print '</td></tr>';
-
-	  print '<tr><td>'.$langs->trans("Date").'</td>';
-	  print "<td colspan=\"2\">".dolibarr_print_date($commande->date,"%A %d %B %Y")."</td>\n";
-      print '</tr>';
-
+    $commande = new Commande($db);
+    $ret=$commande->fetch($_POST["id"]);
+    
+    if (isset($_POST["p_idprod"]))
+    {
+        $result = $commande->addline(
+        $_POST["np_desc"],
+        $_POST["pu"],
+        $_POST["pqty"],
+        $_POST["tva_tx"],
+        $_POST["p_idprod"],
+        $_POST["premise"]);
+    }
+    else
+    {
+        $result = $commande->addline(
+        $_POST["desc"],
+        $_POST["pu"],
+        $_POST["qty"],
+        $_POST["tva_tx"],
+        0,
+        $_POST["remise_percent"]);
+    }
+
+}
+
+if ($_POST["action"] == 'updateligne' && $user->rights->commande->creer) 
+{
+  $commande = new Commande($db,"",$_GET["id"]);
+  if ($commande->fetch($_GET["id"]) )
+    {
+      $result = $commande->update_line($_POST["elrowid"],
+				       $_POST["eldesc"],
+				       $_POST["elprice"],
+				       $_POST["elqty"],
+				       $_POST["elremise_percent"]);
+    }
+  else
+    {
+      print "Erreur";
+    }
+}
+
+if ($_GET["action"] == 'deleteline' && $user->rights->commande->creer) 
+{
+  $commande = new Commande($db);
+  $commande->fetch($_GET["id"]);
+  $result = $commande->delete_line($_GET["lineid"]);
+  Header("Location: fiche.php?id=".$_GET["id"]);
+}
+
+if ($_POST["action"] == 'confirm_valid' && $_POST["confirm"] == 'yes' && $user->rights->commande->valider)
+{
+  $commande = new Commande($db);
+  $commande->fetch($_GET["id"]);
+  $soc = new Societe($db);
+  $soc->fetch($commande->soc_id);
+  $result = $commande->valid($user);
+}
+
+if ($_POST["action"] == 'confirm_close' && $_POST["confirm"] == 'yes' && $user->rights->commande->creer)
+{
+  $commande = new Commande($db);
+  $commande->fetch($_GET["id"]);
+  $result = $commande->cloture($user);
+}
+
+if ($_POST["action"] == 'confirm_cancel' && $_POST["confirm"] == 'yes' && $user->rights->commande->valider)
+{
+  $commande = new Commande($db);
+  $commande->fetch($_GET["id"]);
+  $result = $commande->cancel($user);
+}
+
+if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
+{
+  if ($user->rights->commande->supprimer ) 
+    {
+      $commande = new Commande($db);
+      $commande->id = $_GET["id"];
+      $commande->delete();
+      Header("Location: index.php");
+    }
+}
+
+if ($_GET["action"] == 'pdf')
+{
+  /*
+   * Generation de la commande
+   * définit dans /includes/modules/commande/modules_commande.php
+   */
+  commande_pdf_create($db, $_GET["id"]);
+} 
+
+
+llxHeader('',$langs->trans("OrderCard"),"Commande");
+
+
+
+$html = new Form($db);
+
+/*********************************************************************
+ *
+ * Mode creation
+ *
+ *********************************************************************/
+if ($_GET["action"] == 'create' && $user->rights->commande->creer) 
+{
+  print_titre($langs->trans("CreateOrder"));
+
+  $new_commande = new Commande($db);
+
+  if ($propalid)
+    {
+      $sql = "SELECT s.nom, s.prefix_comm, s.idp, p.price, p.remise, p.remise_percent, p.tva, p.total, p.ref, ".$db->pdate("p.datep")." as dp, c.id as statut, c.label as lst";
+      $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";      
+      $sql .= " AND p.rowid = $propalid";
+    }
+  else
+    {
+      $sql = "SELECT s.nom, s.prefix_comm, s.idp ";
+      $sql .= "FROM ".MAIN_DB_PREFIX."societe as s ";
+      $sql .= "WHERE s.idp = ".$_GET["socidp"];      
+    }
+
+  $resql = $db->query($sql);
+
+  if ( $resql ) 
+    {
+      $num = $db->num_rows($resql);
+      if ($num)
+	{
+	  $obj = $db->fetch_object($resql);
+
+	  $soc = new Societe($db);
+	  $soc->fetch($obj->idp);
+       
+	  print '<form action="fiche.php" method="post">';
+	  print '<input type="hidden" name="action" value="add">';
+	  print '<input type="hidden" name="soc_id" value="'.$soc->id.'">' ."\n";
+	  print '<input type="hidden" name="remise_percent" value="0">';
+	  print '<input name="facnumber" type="hidden" value="provisoire">';
+
+	  print '<table class="border" width="100%">';
+	  
+	  print '<tr><td>'.$langs->trans("Ref").' :</td><td>Provisoire</td>';
+	  print '<td>'.$langs->trans("Comments").' :</td></tr>';
+
+	  $nbrow=3;
+	  if ($conf->projet->enabled) $nbrow++;
+	  print '<tr><td>'.$langs->trans("Customer").' :</td><td>'.$soc->nom_url.'</td><td rowspan="'.$nbrow.'">';
+	  print '<textarea name="note" wrap="soft" cols="50" rows="4"></textarea></td></tr>';	
+
+	  print '<tr><td>'.$langs->trans("Date").' :</td><td>';
+	  $html->select_date();
+	  print "</td></tr>";
+
+	  if ($conf->projet->enabled)
+	  {
+    	  print '<tr><td>'.$langs->trans("Project").' :</td><td>';
+    	  $html->select_projects($soc->id,'','projetid');
+    	  print "</td></tr>";
+      }
+      
+	  print '<tr><td>'.$langs->trans("Source").' :</td><td>';
+	  $html->select_array("source_id",$new_commande->sources,2);
+	  print "</td></tr>";
+
+	  if ($propalid > 0)
+	    {
+	      $amount = ($obj->price);
+	      print '<input type="hidden" name="amount"   value="'.$amount.'">'."\n";
+	      print '<input type="hidden" name="total"    value="'.$obj->total.'">'."\n";
+	      print '<input type="hidden" name="remise"   value="'.$obj->remise.'">'."\n";
+	      print '<input type="hidden" name="remise_percent"   value="'.$obj->remise_percent.'">'."\n";
+	      print '<input type="hidden" name="tva"      value="'.$obj->tva.'">'."\n";
+	      print '<input type="hidden" name="propalid" value="'.$propalid.'">';
+	      
+	      print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2">'.$obj->ref.'</td></tr>';
+	      print '<tr><td>'.$langs->trans("TotalTTC").'</td><td colspan="2">'.price($amount).'</td></tr>';
+	      print '<tr><td>'.$langs->trans("VAT").'</td><td colspan="2">'.price($obj->tva)."</td></tr>";
+	      print '<tr><td>'.$langs->trans("TotalTTC").'</td><td colspan="2">'.price($obj->total)."</td></tr>";
+	    }	  
+	  else
+	    {
+	      /*
+	       * Services/produits prédéfinis
+	       */
+	      $NBLINES=8;
+
+	      print '<tr><td colspan="3">'.$langs->trans("Services").'/'.$langs->trans("Products").'</td></tr>';
+	      print '<tr><td colspan="3">';
+
+	      
+	      print '<table class="noborder">';
+	      print '<tr><td>'.$langs->trans("ProductsAndServices").'</td><td>'.$langs->trans("Qty").'</td><td>'.$langs->trans("Discount").'</td></tr>';
+	      for ($i = 1 ; $i <= $NBLINES ; $i++)
+		{
+		  print '<tr><td>';
+          print $html->select_produits('','idprod'.$i);
+		  print '</td>';
+		  print '<td><input type="text" size="3" name="qty'.$i.'" value="1"></td>';
+		  print '<td><input type="text" size="3" name="remise_percent'.$i.'" value="0">%</td></tr>';
+		}	      	      
+
+	      print '</table>';
+	      print '</td></tr>';
+	    }
+
+	  /*
+	   *
+	   */	  
+	  print '<tr><td colspan="3" align="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></td></tr>';
+	  print "</form>\n";
+	  print "</table>\n";
+
+	  if ($propalid)
+	    {
+	      /*
+	       * Produits
+	       */
+	      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>';
+	      
+		  $var=false;	
+
+	      $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 = $propalid";
+	      $sql .= " ORDER BY pt.rowid ASC";
+	      $result = $db->query($sql);
+	      if ($result) 
+		{
+		  $num = $db->num_rows($result);
+		  $i = 0;	
+		  while ($i < $num) 
+		    {
+		      $objp = $db->fetch_object($result);
+		      $var=!$var;
+		      print "<tr $bc[$var]><td>[$objp->ref]</td>\n";
+		      print '<td>'.img_object($langs->trans("ShowProduct"),"product").' '.$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 = $propalid 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>'.img_object($langs->trans("ShowProduct"),"product").' '.$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
+		{
+		  dolibarr_print_error($db);
+		}
+
+	      print '</table>';
+	    }	  
+	}
+    } 
+  else 
+    {
+      dolibarr_print_error($db);
+    }
+} 
+else 
+/* *************************************************************************** */
+/*                                                                             */
+/* Mode vue et edition                                                         */
+/*                                                                             */
+/* *************************************************************************** */
+{  
+  $id = $_GET["id"];
+  if ($id > 0)
+    {
+      $commande = new Commande($db);
+      if ( $commande->fetch($_GET["id"]) > 0)
+	{	  
+	  $soc = new Societe($db);
+	  $soc->fetch($commande->soc_id);
+	  $author = new User($db);
+	  $author->id = $commande->user_author_id;
+	  $author->fetch();
+
+	  $h=0;
+
+	  if ($conf->commande->enabled && $user->rights->commande->lire)
+	    {
+    	  $head[$h][0] = DOL_URL_ROOT.'/commande/fiche.php?id='.$commande->id;
+    	  $head[$h][1] = $langs->trans("OrderCard");
+    	  $hselected = $h;
+    	  $h++;
+        }
+        	 
+	  if ($conf->expedition->enabled && $user->rights->expedition->lire)
+	    {
+	      $head[$h][0] = DOL_URL_ROOT.'/expedition/commande.php?id='.$commande->id;
+	      $head[$h][1] = $langs->trans("SendingCard");
+	      $h++;
+	    }
+
+	  if ($conf->compta->enabled)
+	    {
+    	  $head[$h][0] = DOL_URL_ROOT.'/compta/commande/fiche.php?id='.$commande->id;
+    	  $head[$h][1] = $langs->trans("ComptaCard");
+    	  $h++;
+        }
+        
+      $head[$h][0] = DOL_URL_ROOT.'/commande/info.php?id='.$commande->id;
+      $head[$h][1] = $langs->trans("Info");
+      $h++;
+
+	  dolibarr_fiche_head($head, $hselected, $langs->trans("Order").": $commande->ref");
+
+	  /*
+	   * Confirmation de la suppression de la commande
+	   */
+	  if ($_GET["action"] == 'delete')
+	    {
+	      $html->form_confirm("fiche.php?id=$id",$langs->trans("DeleteOrder"),$langs->trans("ConfirmDeleteOrder"),"confirm_delete");
+	      print "<br />\n";
+	    }
+	  
+	  /*
+	   * Confirmation de la validation
+	   */
+	  if ($_GET["action"] == 'valid')
+	    {
+	      //$numfa = commande_get_num($soc);
+	      $html->form_confirm("fiche.php?id=$id",$langs->trans("ValidateOrder"),$langs->trans("ConfirmValidateOrder"),"confirm_valid");
+	      print "<br />\n";
+	    }
+
+	  /*
+	   * Confirmation de la cloture
+	   */
+	  if ($_GET["action"] == 'cloture')
+	    {
+	      //$numfa = commande_get_num($soc);
+	      $html->form_confirm("fiche.php?id=$id",$langs->trans("CloseOrder"),$langs->trans("ConfirmCloseOrder"),"confirm_close");
+	      print "<br />\n";
+	    }
+
+	  /*
+	   * Confirmation de l'annulation
+	   */
+	  if ($_GET["action"] == 'annuler')
+	    {
+	      $html->form_confirm("fiche.php?id=$id",$langs->trans("Cancel"),$langs->trans("ConfirmCancel"),"confirm_cancel");
+	      print "<br />\n";
+	    }
+
+	  /*
+	   *   Commande
+	   */
+	  print '<table class="border" width="100%">';
+	  print '<tr><td width="15%">'.$langs->trans("Ref")."</td>";
+	  print '<td colspan="2">'.$commande->ref.'</td>';
+	  print '<td>'.$langs->trans("Source").' : ' . $commande->sources[$commande->source] ;
+	  if ($commande->source == 0)
+	    {
+	      /* Propale */
+	      $propal = new Propal($db);
+	      $propal->fetch($commande->propale_id);
+	      print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.$propal->ref.'</a>';
+	    }
+	  print "</td></tr>";
+
+	  print "<tr><td>".$langs->trans("Customer")."</td>";
+	  print '<td colspan="3">';
+	  print '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
+	  print '</tr>';
+	  
+	  print '<tr><td>'.$langs->trans("Status").'</td>';
+	  print "<td colspan=\"2\">".$commande->statuts[$commande->statut]."</td>\n";
+        $nbrow=6;
+        if ($conf->projet->enabled) $nbrow++;
+        print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans("Note").' :<br>';
+        if ($commande->brouillon == 1 && $user->rights->commande->creer) 
+        {
+        	print '<form action="fiche.php?id='.$id.'" method="post">';
+        	print '<input type="hidden" name="action" value="setnote">';
+        	print '<textarea name="note" style="width:95%;height:"80%">'.$commande->note.'</textarea><br>';
+        	print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'"></center>';
+        	print '</form>';
+        }
+        else
+        {
+        	print nl2br($commande->note);
+        }
+        print '</td></tr>';
+
+	  print '<tr><td>'.$langs->trans("Date").'</td>';
+	  print "<td colspan=\"2\">".dolibarr_print_date($commande->date,"%A %d %B %Y")."</td>\n";
+      print '</tr>';
+
             // Projet
             if ($conf->projet->enabled)
             {
@@ -549,175 +549,175 @@ else
                     $html->form_project($_SERVER["PHP_SELF"]."?id=$commande->id",$commande->fk_soc,$commande->projetid,"none");
                 }
                 print "</td>";
-            } else {
-                print '<td height="10">&nbsp;</td><td colspan="2">&nbsp;</td>';
-            }
-
-		// Lignes de 3 colonnes
-		print '<tr><td>'.$langs->trans("AmountHT").'</td>';
-		print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
-		print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
-		
-
-		print '<tr><td>'.$langs->trans("GlobalDiscount").'</td><td align="right">';
-
-		if ($commande->brouillon == 1 && $user->rights->commande->creer)
-	    {
-	      print '<form action="fiche.php?id='.$id.'" method="post">';
-	      print '<input type="hidden" name="action" value="setremise">';
-	      print '<input type="text" class="flat" name="remise" size="3" value="'.$commande->remise_percent.'">%';
-	      print '</td><td><input type="submit" class="button" value="'.$langs->trans("Save").'">';
-		  print '</form>';
-	    }
-		else
-	    {
-	      print $commande->remise_percent.'%</td><td>&nbsp;';
-	    }
-		print '</td></tr>';
-
-	  print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
-	  print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
-	  print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
-	  print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
-	  
-	  print '</table><br>';
-	  if ($commande->brouillon == 1 && $user->rights->commande->creer) 
-	    {
-	      print '</form>';
-	    }
-	  
-	  /*
-	   * Lignes de commandes
-	   *
-	   */
-        $sql = 'SELECT l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice,';
+            } else {
+                print '<td height="10">&nbsp;</td><td colspan="2">&nbsp;</td>';
+            }
+
+		// Lignes de 3 colonnes
+		print '<tr><td>'.$langs->trans("AmountHT").'</td>';
+		print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
+		print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
+		
+
+		print '<tr><td>'.$langs->trans("GlobalDiscount").'</td><td align="right">';
+
+		if ($commande->brouillon == 1 && $user->rights->commande->creer)
+	    {
+	      print '<form action="fiche.php?id='.$id.'" method="post">';
+	      print '<input type="hidden" name="action" value="setremise">';
+	      print '<input type="text" class="flat" name="remise" size="3" value="'.$commande->remise_percent.'">%';
+	      print '</td><td><input type="submit" class="button" value="'.$langs->trans("Save").'">';
+		  print '</form>';
+	    }
+		else
+	    {
+	      print $commande->remise_percent.'%</td><td>&nbsp;';
+	    }
+		print '</td></tr>';
+
+	  print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
+	  print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
+	  print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
+	  print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
+	  
+	  print '</table><br>';
+	  if ($commande->brouillon == 1 && $user->rights->commande->creer) 
+	    {
+	      print '</form>';
+	    }
+	  
+	  /*
+	   * Lignes de commandes
+	   *
+	   */
+        $sql = 'SELECT l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice,';
 	  	$sql.= ' p.label as product, p.ref, p.fk_product_type, p.rowid as prodid';
-        $sql.= ' FROM '.MAIN_DB_PREFIX."commandedet as l";
+        $sql.= ' FROM '.MAIN_DB_PREFIX."commandedet as l";
 	  	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product=p.rowid';
-        $sql.= " WHERE l.fk_commande = ".$commande->id;
-        $sql.= " ORDER BY l.rowid";
-        
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
-            $i = 0; $total = 0;
-        
+        $sql.= " WHERE l.fk_commande = ".$commande->id;
+        $sql.= " ORDER BY l.rowid";
+        
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $num = $db->num_rows($resql);
+            $i = 0; $total = 0;
+        
 	      print '<table class="noborder" width="100%">';
-            if ($num)
-            {
-                print '<tr class="liste_titre">';
+            if ($num)
+            {
+                print '<tr class="liste_titre">';
 		  print '<td>'.$langs->trans('Description').'</td>';
 		  print '<td align="right" width="50">'.$langs->trans('VAT').'</td>';
 		  print '<td align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
 		  print '<td align="right" width="50">'.$langs->trans('Qty').'</td>';
 		  print '<td align="right" width="50">'.$langs->trans('Discount').'</td>';
 		  print '<td align="right" width="50">'.$langs->trans('AmountHT').'</td>';
-                print '<td>&nbsp;</td><td>&nbsp;</td>';
-                print "</tr>\n";
-            }
-            $var=true;
-            while ($i < $num)
-            {
-                $objp = $db->fetch_object($resql);
-                $var=!$var;
-                
+                print '<td>&nbsp;</td><td>&nbsp;</td>';
+                print "</tr>\n";
+            }
+            $var=true;
+            while ($i < $num)
+            {
+                $objp = $db->fetch_object($resql);
+                $var=!$var;
+                
     			// Affiche ligne de commande en mode non edit
     			if ($_GET['action'] != 'editline' || $_GET['rowid'] != $objp->rowid)
                 {
                     print '<tr '.$bc[$var].'>';
-                    if ($objp->fk_product > 0)
-                    {
+                    if ($objp->fk_product > 0)
+                    {
                         print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
                         if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service');
                         else print img_object($langs->trans('ShowProduct'),'product');
                         print ' '.$objp->ref.'</a> - '.stripslashes(nl2br($objp->product));
                         print ($objp->description && $objp->description!=$objp->product)?'<br>'.$objp->description:'';
                         print '</td>';
-                    }
-                    else
-                    {
-                        print '<td>'.stripslashes(nl2br($objp->description));
-                        print "</td>\n";
-                    }
-                    print '<td align="right">'.$objp->tva_tx.'%</td>';
-                
-                    print '<td align="right">'.price($objp->subprice)."</td>\n";
-                
-                    print '<td align="right">'.$objp->qty.'</td>';
-                
-                    if ($objp->remise_percent > 0)
-                    {
-                        print '<td align="right">'.$objp->remise_percent."%</td>\n";
-                    }
-                    else
-                    {
-                        print '<td>&nbsp;</td>';
-                    }
+                    }
+                    else
+                    {
+                        print '<td>'.stripslashes(nl2br($objp->description));
+                        print "</td>\n";
+                    }
+                    print '<td align="right">'.$objp->tva_tx.'%</td>';
+                
+                    print '<td align="right">'.price($objp->subprice)."</td>\n";
+                
+                    print '<td align="right">'.$objp->qty.'</td>';
+                
+                    if ($objp->remise_percent > 0)
+                    {
+                        print '<td align="right">'.$objp->remise_percent."%</td>\n";
+                    }
+                    else
+                    {
+                        print '<td>&nbsp;</td>';
+                    }
                     print '<td align="right">'.price($objp->subprice*$objp->qty*(100-$objp->remise_percent)/100)."</td>\n";
-                
+                
                     // Icone d'edition et suppression
-                    if ($commande->statut == 0  && $user->rights->commande->creer && $_GET["action"] == '')
-                    {
-                        print '<td align="right"><a href="fiche.php?id='.$id.'&amp;action=editline&amp;rowid='.$objp->rowid.'">';
-                        print img_edit();
-                        print '</a></td>';
-                        print '<td align="right"><a href="fiche.php?id='.$id.'&amp;action=deleteline&amp;lineid='.$objp->rowid.'">';
-                        print img_delete();
-                        print '</a></td>';
-                    }
-                    else
-                    {
-                        print '<td>&nbsp;</td><td>&nbsp;</td>';
-                    }
+                    if ($commande->statut == 0  && $user->rights->commande->creer && $_GET["action"] == '')
+                    {
+                        print '<td align="right"><a href="fiche.php?id='.$id.'&amp;action=editline&amp;rowid='.$objp->rowid.'">';
+                        print img_edit();
+                        print '</a></td>';
+                        print '<td align="right"><a href="fiche.php?id='.$id.'&amp;action=deleteline&amp;lineid='.$objp->rowid.'">';
+                        print img_delete();
+                        print '</a></td>';
+                    }
+                    else
+                    {
+                        print '<td>&nbsp;</td><td>&nbsp;</td>';
+                    }
                     print '</tr>';
-                }
-        
+                }
+        
     			// Affiche ligne de commande en mode non edit
-                if ($_GET["action"] == 'editline' && $_GET["rowid"] == $objp->rowid)
-                {
-                    print "<form action=\"fiche.php?id=$id\" method=\"post\">";
-                    print '<input type="hidden" name="action" value="updateligne">';
-                    print '<input type="hidden" name="elrowid" value="'.$_GET["rowid"].'">';
-                    print "<tr $bc[$var]>";
-                    print '<td>';
-                    if ($objp->fk_product > 0)
-                    {
-                        print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
-                        if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service');
-                        else print img_object($langs->trans('ShowProduct'),'product');
-                        print ' '.$objp->ref.'</a>';
-                        print ' - '.stripslashes(nl2br($objp->product));
-                        print '<br>';
-                    }
-                    print '<textarea name="eldesc" cols="50" rows="1">'.stripslashes($objp->description).'</textarea></td>';
-                    print '<td align="right">';
-                    //print $html->select_tva("tva_tx",$objp->tva_taux);
-                    print $objp->tva_tx."%";    // Taux tva dépend du produit, donc on ne doit pas pouvoir le changer ici
-                    print '</td>';
-                    print '<td align="right"><input size="5" type="text" class="flat" name="elprice" value="'.price($objp->subprice).'"></td>';
-                    print '<td align="right"><input size="2" type="text" class="flat" name="elqty" value="'.$objp->qty.'"></td>';
-                    print '<td align="right" nowrap><input size="1" type="text" class="flat" name="elremise_percent" value="'.$objp->remise_percent.'">%</td>';
-                    print '<td align="center" colspan="3"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td>';
+                if ($_GET["action"] == 'editline' && $_GET["rowid"] == $objp->rowid)
+                {
+                    print "<form action=\"fiche.php?id=$id\" method=\"post\">";
+                    print '<input type="hidden" name="action" value="updateligne">';
+                    print '<input type="hidden" name="elrowid" value="'.$_GET["rowid"].'">';
+                    print "<tr $bc[$var]>";
+                    print '<td>';
+                    if ($objp->fk_product > 0)
+                    {
+                        print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
+                        if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service');
+                        else print img_object($langs->trans('ShowProduct'),'product');
+                        print ' '.$objp->ref.'</a>';
+                        print ' - '.stripslashes(nl2br($objp->product));
+                        print '<br>';
+                    }
+                    print '<textarea name="eldesc" cols="50" rows="1">'.stripslashes($objp->description).'</textarea></td>';
+                    print '<td align="right">';
+                    //print $html->select_tva("tva_tx",$objp->tva_taux);
+                    print $objp->tva_tx."%";    // Taux tva dépend du produit, donc on ne doit pas pouvoir le changer ici
+                    print '</td>';
+                    print '<td align="right"><input size="5" type="text" class="flat" name="elprice" value="'.price($objp->subprice).'"></td>';
+                    print '<td align="right"><input size="2" type="text" class="flat" name="elqty" value="'.$objp->qty.'"></td>';
+                    print '<td align="right" nowrap><input size="1" type="text" class="flat" name="elremise_percent" value="'.$objp->remise_percent.'">%</td>';
+                    print '<td align="center" colspan="3"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td>';
 				    print '</tr>';
 					print '</form>';
-                }
+                }
 
 		  $total = $total + ($objp->qty * $objp->price);
-                $i++;
-            }
-            $db->free($resql);
-        }
-        else
-        {
-            dolibarr_print_error($db);
-        }
-	
-        /*
-         * Ajouter une ligne
-         */
-        if ($commande->statut == 0 && $user->rights->commande->creer && $_GET["action"] == '') 
-          {
+                $i++;
+            }
+            $db->free($resql);
+        }
+        else
+        {
+            dolibarr_print_error($db);
+        }
+	
+        /*
+         * Ajouter une ligne
+         */
+        if ($commande->statut == 0 && $user->rights->commande->creer && $_GET["action"] == '') 
+          {
 	      print '<tr class="liste_titre">';
 	      print '<td>'.$langs->trans('Description').'</td>';
             print '<td align="right">'.$langs->trans('VAT').'</td>';
@@ -728,32 +728,32 @@ else
 	      print '<td>&nbsp;</td>';
 	      print '<td>&nbsp;</td>';
 	      print "</tr>\n";
-        
+        
               // Ajout produit produits/services personalisés
-            print "<form action=\"fiche.php?id=$id\" method=\"post\">";
+            print "<form action=\"fiche.php?id=$id\" method=\"post\">";
 	      	print '<input type="hidden" name="id" value="'.$id.'">';
-            print '<input type="hidden" name="action" value="addligne">';
-            
-            $var=true;
+            print '<input type="hidden" name="action" value="addligne">';
+            
+            $var=true;
 	      	print '<tr '.$bc[$var].">\n";
 	      	print '  <td><textarea cols="50" name="desc" rows="1"></textarea></td>';
-            print '<td align="center">';
-            print $html->select_tva("tva_tx",$conf->defaulttx);
-            print '</td>';
-            print '<td align="right"><input type="text" name="pu" size="5"></td>';
-            print '<td align="right"><input type="text" name="qty" value="1" size="2"></td>';
-            print '<td align="right" nowrap><input type="text" name="remise_percent" size="2" value="0">%</td>';
-            print '<td align="center" colspan="3"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
-        	print '</tr>';
-        	
+            print '<td align="center">';
+            print $html->select_tva("tva_tx",$conf->defaulttx);
+            print '</td>';
+            print '<td align="right"><input type="text" name="pu" size="5"></td>';
+            print '<td align="right"><input type="text" name="qty" value="1" size="2"></td>';
+            print '<td align="right" nowrap><input type="text" name="remise_percent" size="2" value="0">%</td>';
+            print '<td align="center" colspan="3"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
+        	print '</tr>';
+        	
 	        print '</form>';
-
+
             // Ajout de produits/services prédéfinis
-            print "<form action=\"fiche.php?id=$id\" method=\"post\">";
-	      	print '<input type="hidden" name="id" value="'.$id.'">';
-            print '<input type="hidden" name="action" value="addligne">';
-
-            $var=!$var;
+            print "<form action=\"fiche.php?id=$id\" method=\"post\">";
+	      	print '<input type="hidden" name="id" value="'.$id.'">';
+            print '<input type="hidden" name="action" value="addligne">';
+
+            $var=!$var;
             print '<tr '.$bc[$var].'>';
             print '<td colspan="2">';
             $html->select_produits('','p_idprod','',20);
@@ -761,188 +761,188 @@ else
             print '<textarea cols="50" name="np_desc" rows="1"></textarea>';
             print '</td>';
 	   		print '<td>&nbsp;</td>';
-            print '<td align="right"><input type="text" size="2" name="pqty" value="1"></td>';
-            print '<td align="right" nowrap><input type="text" size="2" name="premise" value="0">%</td>';
-            print '<td align="center" colspan="3"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
-            print "</tr>\n";
-        
+            print '<td align="right"><input type="text" size="2" name="pqty" value="1"></td>';
+            print '<td align="right" nowrap><input type="text" size="2" name="premise" value="0">%</td>';
+            print '<td align="center" colspan="3"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
+            print "</tr>\n";
+        
 	      print '</form>';
-          }
-          
-
-	print '</table>';
-
-
-	print '</div>';
-
-
-    /*
-     * Boutons actions
-     */
-    if ($user->societe_id == 0 && $commande->statut < 3 && $_GET["action"] == '')
-    {
-        print '<div class="tabsAction">';
-    
-        if ($conf->expedition->enabled && $commande->statut > 0 && $commande->statut < 3 && $user->rights->expedition->creer)
-        {
-            print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/commande.php?id='.$_GET["id"].'">'.$langs->trans("Send").'</a>';
-        }
-    
-    
-        if ($commande->statut == 0)
-        {
-            if ($user->rights->commande->valider)
-            {
-                print '<a class="butAction" href="fiche.php?id='.$id.'&amp;action=valid">'.$langs->trans("Valid").'</a>';
-            }
-        }
-
-        if ($commande->statut == 1 || $commande->statut == 2)
-        {
-            if ($user->rights->commande->creer)
-            {
-                print '<a class="butAction" href="fiche.php?id='.$id.'&amp;action=cloture">'.$langs->trans("Close").'</a>';
-            }
-        }
-    
-        if ($commande->statut == 0 && $user->rights->commande->supprimer)
-        {
-            print '<a class="butActionDelete" href="fiche.php?id='.$id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
-        }
-    
-        if ($commande->statut == 1)
-        {
-            $nb_expedition = $commande->nb_expedition();
-            if ($user->rights->commande->valider && $nb_expedition == 0)
-            {
-                print '<a class="butActionDelete" href="fiche.php?id='.$id.'&amp;action=annuler">'.$langs->trans("CancelOrder").'</a>';
-            }
-        }
-    
-        print "</div>";
-    }
-	print "<br>\n";
-
-
-	print '<table width="100%"><tr><td width="50%" valign="top">';
-
-	/*
-	 * Documents générés
-	 *
-	 */
-	$file = $conf->commande->dir_output . "/" . $commande->ref . "/" . $commande->ref . ".pdf";
-	$relativepath = $commande->ref."/".$commande->ref.".pdf";
-    
-	$var=true;
-	
-	if (file_exists($file))
-	  {
-
-	    print_titre($langs->trans("Documents"));
-	    print '<table width="100%" class="border">';
-	    
-	    print "<tr $bc[$var]><td>".$langs->trans("Order")." PDF</td>";
-        print '<td><a href="'.DOL_URL_ROOT . '/document.php?modulepart=commande&file='.urlencode($relativepath).'">'.$commande->ref.'.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>';
-	    print '</tr>';
-	           	
-	    print "</table>\n";
-
-        print '<br>';
-	  }
-
-	/*
-	 * Liste des factures
-	 */
-	$sql = "SELECT f.rowid,f.facnumber, f.total_ttc, ".$db->pdate("f.datef")." as df";
-	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."co_fa as cf";
-	$sql .= " WHERE f.rowid = cf.fk_facture AND cf.fk_commande = ". $commande->id;
-	    
-	$result = $db->query($sql);
-	if ($result)
-	  {
-	    $num = $db->num_rows($result);
-	    if ($num)
-	      {
-		print_titre($langs->trans("RelatedBills"));
-		$i = 0; $total = 0;
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><td>'.$langs->trans("Ref")."</td>";
-		print '<td align="center">'.$langs->trans("Date").'</td>';
-		print '<td align="right">'.$langs->trans("Price").'</td>';
-		print "</tr>\n";
-		
-		$var=True;
-		while ($i < $num)
-		  {
-		    $objp = $db->fetch_object($result);
-		    $var=!$var;
-		    print "<tr $bc[$var]>";
-		    print '<td><a href="../compta/facture.php?facid='.$objp->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$objp->facnumber.'</a></td>';
-		    print '<td align="center">'.dolibarr_print_date($objp->df).'</td>';
-		    print '<td align="right">'.$objp->total_ttc.'</td></tr>';
-		    $i++;
-		  }
-		print "</table>";
-	      }
-	  }
-	else
-	  {
-	    dolibarr_print_error($db);
-	  }
-
-
-    print '</td><td valign="top" width="50%">';
-
-	/*
-	 * Liste des expéditions
-	 */
-	$sql = "SELECT e.rowid,e.ref,".$db->pdate("e.date_expedition")." as de";
-	$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
-	$sql .= " WHERE e.fk_commande = ". $commande->id;
-	    
-    $result = $db->query($sql);
-    if ($result)
-    {
-        $num = $db->num_rows($result);
-        if ($num)
-        {
-            print_titre($langs->trans("Sendings"));
-            $i = 0; $total = 0;
-            print '<table class="border" width="100%">';
-            print "<tr $bc[$var]><td>".$langs->trans("Sendings")."</td><td>".$langs->trans("Date")."</td></tr>\n";
-    
-            $var=True;
-            while ($i < $num)
-            {
-                $objp = $db->fetch_object($result);
-                $var=!$var;
-                print "<tr $bc[$var]>";
-                print '<td><a href="../expedition/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowSending"),"sending").' '.$objp->ref.'</a></td>';
-                print "<td>".dolibarr_print_date($objp->de)."</td></tr>\n";
-                $i++;
-            }
-            print "</table>";
-        }
-    }
-    else
-    {
-        dolibarr_print_error($db);
-    }
-
-	print "</td></tr></table>";
-
-      }
-    else
-      {
-	/* Commande non trouvée */
-	print "Commande inexistante ou accés refusé";
-      }
-  }  
-}
-
-$db->close();
-
-llxFooter('$Date$ - $Revision$');
-?>
+          }
+          
+
+	print '</table>';
+
+
+	print '</div>';
+
+
+    /*
+     * Boutons actions
+     */
+    if ($user->societe_id == 0 && $commande->statut < 3 && $_GET["action"] == '')
+    {
+        print '<div class="tabsAction">';
+    
+        if ($conf->expedition->enabled && $commande->statut > 0 && $commande->statut < 3 && $user->rights->expedition->creer)
+        {
+            print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/commande.php?id='.$_GET["id"].'">'.$langs->trans("Send").'</a>';
+        }
+    
+    
+        if ($commande->statut == 0)
+        {
+            if ($user->rights->commande->valider)
+            {
+                print '<a class="butAction" href="fiche.php?id='.$id.'&amp;action=valid">'.$langs->trans("Valid").'</a>';
+            }
+        }
+
+        if ($commande->statut == 1 || $commande->statut == 2)
+        {
+            if ($user->rights->commande->creer)
+            {
+                print '<a class="butAction" href="fiche.php?id='.$id.'&amp;action=cloture">'.$langs->trans("Close").'</a>';
+            }
+        }
+    
+        if ($commande->statut == 0 && $user->rights->commande->supprimer)
+        {
+            print '<a class="butActionDelete" href="fiche.php?id='.$id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+        }
+    
+        if ($commande->statut == 1)
+        {
+            $nb_expedition = $commande->nb_expedition();
+            if ($user->rights->commande->valider && $nb_expedition == 0)
+            {
+                print '<a class="butActionDelete" href="fiche.php?id='.$id.'&amp;action=annuler">'.$langs->trans("CancelOrder").'</a>';
+            }
+        }
+    
+        print "</div>";
+    }
+	print "<br>\n";
+
+
+	print '<table width="100%"><tr><td width="50%" valign="top">';
+
+	/*
+	 * Documents générés
+	 *
+	 */
+	$file = $conf->commande->dir_output . "/" . $commande->ref . "/" . $commande->ref . ".pdf";
+	$relativepath = $commande->ref."/".$commande->ref.".pdf";
+    
+	$var=true;
+	
+	if (file_exists($file))
+	  {
+
+	    print_titre($langs->trans("Documents"));
+	    print '<table width="100%" class="border">';
+	    
+	    print "<tr $bc[$var]><td>".$langs->trans("Order")." PDF</td>";
+        print '<td><a href="'.DOL_URL_ROOT . '/document.php?modulepart=commande&file='.urlencode($relativepath).'">'.$commande->ref.'.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>';
+	    print '</tr>';
+	           	
+	    print "</table>\n";
+
+        print '<br>';
+	  }
+
+	/*
+	 * Liste des factures
+	 */
+	$sql = "SELECT f.rowid,f.facnumber, f.total_ttc, ".$db->pdate("f.datef")." as df";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."co_fa as cf";
+	$sql .= " WHERE f.rowid = cf.fk_facture AND cf.fk_commande = ". $commande->id;
+	    
+	$result = $db->query($sql);
+	if ($result)
+	  {
+	    $num = $db->num_rows($result);
+	    if ($num)
+	      {
+		print_titre($langs->trans("RelatedBills"));
+		$i = 0; $total = 0;
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre"><td>'.$langs->trans("Ref")."</td>";
+		print '<td align="center">'.$langs->trans("Date").'</td>';
+		print '<td align="right">'.$langs->trans("Price").'</td>';
+		print "</tr>\n";
+		
+		$var=True;
+		while ($i < $num)
+		  {
+		    $objp = $db->fetch_object($result);
+		    $var=!$var;
+		    print "<tr $bc[$var]>";
+		    print '<td><a href="../compta/facture.php?facid='.$objp->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$objp->facnumber.'</a></td>';
+		    print '<td align="center">'.dolibarr_print_date($objp->df).'</td>';
+		    print '<td align="right">'.$objp->total_ttc.'</td></tr>';
+		    $i++;
+		  }
+		print "</table>";
+	      }
+	  }
+	else
+	  {
+	    dolibarr_print_error($db);
+	  }
+
+
+    print '</td><td valign="top" width="50%">';
+
+	/*
+	 * Liste des expéditions
+	 */
+	$sql = "SELECT e.rowid,e.ref,".$db->pdate("e.date_expedition")." as de";
+	$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+	$sql .= " WHERE e.fk_commande = ". $commande->id;
+	    
+    $result = $db->query($sql);
+    if ($result)
+    {
+        $num = $db->num_rows($result);
+        if ($num)
+        {
+            print_titre($langs->trans("Sendings"));
+            $i = 0; $total = 0;
+            print '<table class="border" width="100%">';
+            print "<tr $bc[$var]><td>".$langs->trans("Sendings")."</td><td>".$langs->trans("Date")."</td></tr>\n";
+    
+            $var=True;
+            while ($i < $num)
+            {
+                $objp = $db->fetch_object($result);
+                $var=!$var;
+                print "<tr $bc[$var]>";
+                print '<td><a href="../expedition/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowSending"),"sending").' '.$objp->ref.'</a></td>';
+                print "<td>".dolibarr_print_date($objp->de)."</td></tr>\n";
+                $i++;
+            }
+            print "</table>";
+        }
+    }
+    else
+    {
+        dolibarr_print_error($db);
+    }
+
+	print "</td></tr></table>";
+
+      }
+    else
+      {
+	/* Commande non trouvée */
+	print "Commande inexistante ou accés refusé";
+      }
+  }  
+}
+
+$db->close();
+
+llxFooter('$Date$ - $Revision$');
+?>