From 58daf562d6bb046f1f67c2e249b059edc9bbc67e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 6 Oct 2007 12:08:09 +0000
Subject: [PATCH] modifs esthetique mineure

---
 htdocs/compta/commande/fiche.php | 128 +------------------------------
 1 file changed, 4 insertions(+), 124 deletions(-)

diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php
index b7dba77362d..d985743f310 100644
--- a/htdocs/compta/commande/fiche.php
+++ b/htdocs/compta/commande/fiche.php
@@ -319,11 +319,9 @@ if ($_GET["id"] > 0)
                 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('ReductionShort').'</td>';
-				print '<td align="right" width="50">'.$langs->trans('AmountHT').'</td>';
-                print '<td>&nbsp;</td>';
-                print '<td>&nbsp;</td>';
-                print '<td>&nbsp;</td>';
+                print '<td align="right" width="50">'.$langs->trans('ReductionShort').'</td>';
+                print '<td align="right" width="50">'.$langs->trans('AmountHT').'</td>';
+                print '<td width="48" colspan="3">&nbsp;</td>';
                 print "</tr>\n";
             }
 
@@ -395,9 +393,7 @@ if ($_GET["id"] > 0)
 
                 print '<td align="right">'.price($objp->subprice*$objp->qty*(100-$objp->remise_percent)/100)."</td>\n";
 
-                print '<td>&nbsp;</td>';
-                print '<td>&nbsp;</td>';
-                print '<td>&nbsp;</td>';
+                print '<td colspan="3">&nbsp;</td>';
                 print '</tr>';
 
 				$total = $total + ($objp->qty * $objp->price);
@@ -410,122 +406,6 @@ if ($_GET["id"] > 0)
             dolibarr_print_error($db);
         }
 
-			/*
-			 * Lignes de remise
-			 */
-
-    		// Réductions relatives (Remises-Ristournes-Rabbais)
-/* Une réduction doit s'appliquer obligatoirement sur des lignes de factures
-   et non globalement
-			$var=!$var;
-			print '<form name="updateligne" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-			print '<input type="hidden" name="action" value="setremisepercent">';
-			print '<input type="hidden" name="id" value="'.$commande->id.'">';
-			print '<tr class="liste_total"><td>';
-			print $langs->trans('CustomerRelativeDiscount');
-			if ($commande->brouillon) print ' <font style="font-weight: normal">('.($soc->remise_client?$langs->trans("CompanyHasRelativeDiscount",$soc->remise_client):$langs->trans("CompanyHasNoRelativeDiscount")).')</font>';
-			print '</td>';
-			print '<td>&nbsp;</td>';
-			print '<td>&nbsp;</td>';
-			print '<td>&nbsp;</td>';
-			print '<td align="right"><font style="font-weight: normal">';
-			if ($_GET['action'] == 'editrelativediscount')
-			{
-				print '<input type="text" name="remise_percent" size="2" value="'.$commande->remise_percent.'">%';
-			}
-			else
-			{
-				print $commande->remise_percent?$commande->remise_percent.'%':'&nbsp;';
-			}
-			print '</font></td>';
-			print '<td align="right"><font style="font-weight: normal">';
-			if ($_GET['action'] != 'editrelativediscount') print $commande->remise_percent?'-'.price($commande->remise_percent*$total/100):$langs->trans("DiscountNone");
-			else print '&nbsp;';
-			print '</font></td>';
-			if ($_GET['action'] != 'editrelativediscount')
-			{
-				if (1 == 2 && $commande->brouillon && $user->rights->facture->creer)
-				{
-					print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editrelativediscount&amp;id='.$commande->id.'">'.img_edit($langs->trans('SetRelativeDiscount'),1).'</a></td>';
-				}
-				else
-				{
-					print '<td>&nbsp;</td>';
-				}
-				if (1 == 2 && $commande->brouillon && $user->rights->facture->creer && $commande->remise_percent)
-				{
-					print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?id='.$commande->id.'&amp;action=setremisepercent&amp;rowid='.$objp->rowid.'">';
-					print img_delete();
-					print '</a></td>';
-				}
-				else
-				{
-					print '<td>&nbsp;</td>';
-				}
-				print '<td>&nbsp;</td>';
-			}
-			else
-			{
-				print '<td colspan="3"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td>';
-			}
-			print '</tr>';
-			print '</form>';
-*/
-
-	        // Remises absolue
-/* 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">';
-			print '<input type="hidden" name="id" value="'.$commande->id.'">';
-			print '<tr class="liste_total"><td>';
-			print $langs->trans('CustomerAbsoluteDiscount');
-			if ($commande->brouillon) print ' <font style="font-weight: normal">('.($avoir_en_cours?$langs->trans("CompanyHasAbsoluteDiscount",$avoir_en_cours,$langs->trans("Currency".$conf->monnaie)):$langs->trans("CompanyHasNoAbsoluteDiscount")).')</font>';
-			print '</td>';
-			print '<td>&nbsp;</td>';
-			print '<td>&nbsp;</td>';
-			print '<td>&nbsp;</td>';
-			print '<td>&nbsp;</td>';
-			print '<td align="right"><font style="font-weight: normal">';
-			if ($_GET['action'] == 'editabsolutediscount')
-			{
-				print '-<input type="text" name="remise_absolue" size="2" value="'.$commande->remise_absolue.'">';
-			}
-			else
-			{
-				print $commande->remise_absolue?'-'.price($commande->remise_absolue):$langs->trans("DiscountNone");
-			}
-			print '</font></td>';
-			if ($_GET['action'] != 'editabsolutediscount')
-			{
-				if (1 == 2 && $commande->brouillon && $user->rights->facture->creer)
-				{
-					print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editabsolutediscount&amp;id='.$commande->id.'">'.img_edit($langs->trans('SetAbsoluteDiscount'),1).'</a></td>';
-				}
-				else
-				{
-					print '<td>&nbsp;</td>';
-				}
-				if (1 == 2 && $commande->brouillon && $user->rights->facture->creer && $commande->remise_absolue)
-				{
-					print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?id='.$commande->id.'&amp;action=setremiseabsolue&amp;rowid='.$objp->rowid.'">';
-					print img_delete();
-					print '</a></td>';
-				}
-				else
-				{
-					print '<td>&nbsp;</td>';
-				}
-				print '<td>&nbsp;</td>';
-			}
-			else
-			{
-				print '<td colspan="3"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td>';
-			}
-			print '</tr>';
-			print '</form>';
-*/
-
         print '</table>';
 
         print '</div>';