From 686ed5f14487e7e782434b00658d013635183600 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 5 Dec 2006 22:41:40 +0000
Subject: [PATCH] =?UTF-8?q?New:=20Possibilit=E9=20de=20d=E9finir=20taux=20?=
 =?UTF-8?q?tva=20sur=20commande=20fournisseurs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/fourn/commande/fiche.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index c8c38733ac1..66c2ab73834 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -609,7 +609,7 @@ else
 			$sql.= ", p.label";
 			$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet	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.= " WHERE l.fk_commande = ".$commande->id;
 			$sql.= " ORDER BY l.rowid";
 	
 			$resql = $db->query($sql);
@@ -669,14 +669,17 @@ else
 					if ($_GET["action"]	== 'editline' && $_GET["rowid"]	== $objp->rowid)
 					{
 						print "<form action=\"fiche.php?id=$commande->id\" method=\"post\">";
+						print "<tr $bc[$var]>";
+						print '<td><textarea name="eldesc" cols="60" rows="'.ROWS_2.'">'.$objp->description.'</textarea>';
 						print '<input type="hidden"	name="action" value="updateligne">';
 						print '<input type="hidden"	name="elrowid" value="'.$_GET["rowid"].'">';
 						print '<input type="hidden"	name="id" value="'.$_REQUEST["id"].'">';
-						print "<tr $bc[$var]>";
-						print '<td><textarea name="eldesc" cols="60" rows="2">'.$objp->description.'</textarea></td>';
-						print '<td>&nbsp;</td>';
+						print '</td>';
+						print '<td>';
+						$html->select_tva('tva_tx',$objp->tva_tx);
+						print '</td>';
 						print '<td align="center"><input size="3" type="text" name="qty" value="'.$objp->qty.'"></td>';
-						print '<td align="right"><input	size="2" type="text" name="remise_percent" value="'.$objp->remise_percent.'">&nbsp;%</td>';
+						print '<td align="right"><input	size="2" type="text" name="remise_percent" value="'.$objp->remise_percent.'">%</td>';
 						print '<td align="right"><input	size="6" type="text" name="pu"	value="'.price($objp->subprice).'"></td>';
 						print '<td align="center" colspan="2"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 						print '<br /><input	type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';