From e815a07560643b100e5b4ab8a422f023432072af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 25 May 2006 15:48:35 +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/compta/facture.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index c16703ba3ac..2ff0e8173e0 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1732,7 +1732,8 @@ else
 			 * Lignes de remise
 			 */
 			
-			// Remise relative
+    // Réductions relatives (Remises-Ristournes-Rabbais)
+/* Une réduction doit s'appliquer obligatoirement sur des lignes de factures
 			$var=!$var;
 			print '<form name="updateligne" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 			print '<input type="hidden" name="action" value="setremisepercent">';
@@ -1786,8 +1787,10 @@ else
 			}
 			print '</tr>';
 			print '</form>';
+*/
 
-			// Remise absolue
+		    // Réductions absolues (Remises-Ristournes-Rabbais)
+/* Les remises absolues doivent s'appliquer par ajout de lignes spécialisées
 			$var=!$var;
 			print '<form name="updateligne" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 			print '<input type="hidden" name="action" value="setremiseabsolue">';
@@ -1838,7 +1841,7 @@ else
 			}
 			print '</tr>';
 			print '</form>';
-
+*/
 
 			/*
 			 * Ajouter une ligne
@@ -1874,7 +1877,7 @@ else
 				print '</td>';
 				print '<td align="right"><input type="text" name="pu" size="6"></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="1" value="0">%</td>';
+				print '<td align="right" nowrap><input type="text" name="remise_percent" size="1" value="'.$soc->remise_client.'">%</td>';
 				print '<td align="center" valign="middle" colspan="4"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
 				print '</tr>';
 				if ($conf->service->enabled)
@@ -1908,7 +1911,7 @@ else
                     print '<textarea name="desc" cols="70" rows="'.ROWS_2.'"></textarea></td>';
                     print '<td>&nbsp;</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="right" nowrap><input type="text" name="remise_percent" size="1" value="'.$soc->remise_client.'">%</td>';
     				print '<td align="center" valign="middle" rowspan="2" colspan="5"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
     				print '</tr>';
     				if ($conf->service->enabled)