From 73fc7a692585204c06e8fa5c944ebf29961c697d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 25 May 2006 19:05:52 +0000
Subject: [PATCH] =?UTF-8?q?New:=20La=20remise=20relative=20par=20d=E9faut?=
 =?UTF-8?q?=20d'une=20soci=E9t=E9=20se=20positionne=20sur=20la=20ligne?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/addpropal.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index bc58de266cb..8d0708bf0f6 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -108,6 +108,17 @@ if ($_GET["action"] == 'create')
 	print '</td>';
 	print '</tr>';
 
+	// Ligne info remises tiers
+    print '<tr><td>'.$langs->trans('Info').'</td><td colspan="2">';
+	if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
+	else print $langs->trans("CompanyHasNoRelativeDiscount");
+	$absolute_discount=$soc->getCurrentDiscount();
+	print '. ';
+	if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie));
+	else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+	print '.';
+	print '</td></tr>';
+
 	// Date facture
 	print '<tr><td>'.$langs->trans('Date').'</td><td colspan="2">';
 	$html->select_date('','','','','',"addprop");
@@ -324,7 +335,7 @@ if ($_GET["action"] == 'create')
             	$html->select_produits('',"idprod".$i,'',$conf->produit->limit_size);
             print '</td>';
             print '<td><input type="text" size="2" name="qty'.$i.'" value="1"></td>';
-            print '<td><input type="text" size="2" name="remise'.$i.'" value="">%</td>';
+            print '<td><input type="text" size="2" name="remise'.$i.'" value="'.$soc->remise_client.'">%</td>';
 			print '</tr>';
         }