From e8a49fe288b65751b4a58dc1349777568b53fe60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 19 Feb 2011 12:50:31 +0000
Subject: [PATCH] New: Add a cancel button on discount creation page

---
 htdocs/comm/fiche.php |  6 +++---
 htdocs/comm/remx.php  | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index ca247158afa..944398f26e3 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -323,7 +323,7 @@ if ($socid > 0)
 	print "</td>";
 	print '</tr>';
 
-	// Reductions relative (Discounts-Drawbacks-Rebates)
+	// Relative discounts (Discounts-Drawbacks-Rebates)
 	print '<tr><td nowrap>';
 	print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
 	print $langs->trans("CustomerRelativeDiscountShort");
@@ -336,7 +336,7 @@ if ($socid > 0)
 	print '</td><td colspan="3">'.($objsoc->remise_client?$objsoc->remise_client.'%':$langs->trans("DiscountNone")).'</td>';
 	print '</tr>';
 
-	// Reductions absolues (Discounts-Drawbacks-Rebates)
+	// Absolute discounts (Discounts-Drawbacks-Rebates)
 	print '<tr><td nowrap>';
 	print '<table width="100%" class="nobordernopadding">';
 	print '<tr><td nowrap>';
@@ -344,7 +344,7 @@ if ($socid > 0)
 	print '<td><td align="right">';
 	if ($user->rights->societe->creer && !$user->societe_id > 0)
 	{
-		print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$objsoc->id.'">'.img_edit($langs->trans("Modify")).'</a>';
+		print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$objsoc->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$objsoc->id).'">'.img_edit($langs->trans("Modify")).'</a>';
 	}
 	print '</td></tr></table>';
 	print '</td>';
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 545dc91d9cd..b5b976af843 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -318,13 +318,13 @@ if ($_socid > 0)
 		print '<table width="100%" class="noborder">';
 		print '<tr class="liste_titre">';
 		print '<td width="120" align="left">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
-		print '<td width="150" align="left">'.$langs->trans("ReasonDiscount").'</td>';
-		print '<td align="left" nowrap="nowrap">'.$langs->trans("ConsumedBy").'</td>';
+		print '<td align="left">'.$langs->trans("ReasonDiscount").'</td>';
+		print '<td width="150" nowrap="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 		print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>';
 		print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>';
 		print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td>';
 		print '<td width="100" align="center">'.$langs->trans("DiscountOfferedBy").'</td>';
-		print '<td width="20">&nbsp;</td>';
+		print '<td width="50">&nbsp;</td>';
 		print '</tr>';
 
 		$var = true;
@@ -360,7 +360,7 @@ if ($_socid > 0)
 				print $obj->description;
 				print '</td>';
 			}
-			print '<td align="left" nowrap="nowrap">'.$langs->trans("NotConsumed").'</td>';
+			print '<td nowrap="nowrap">'.$langs->trans("NotConsumed").'</td>';
 			print '<td align="right">'.price($obj->amount_ht).'</td>';
 			print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
 			print '<td align="right">'.price($obj->amount_ttc).'</td>';
@@ -454,13 +454,13 @@ if ($_socid > 0)
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<td width="120" align="left">'.$langs->trans("Date").'</td>';	// Need 120+ for format with AM/PM
-		print '<td width="150" align="left">'.$langs->trans("ReasonDiscount").'</td>';
-		print '<td align="left" nowrap="nowrap">'.$langs->trans("ConsumedBy").'</td>';
+		print '<td align="left">'.$langs->trans("ReasonDiscount").'</td>';
+		print '<td width="150" nowrap="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 		print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>';
 		print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>';
 		print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td>';
 		print '<td width="100" align="center">'.$langs->trans("Author").'</td>';
-		print '<td width="20">&nbsp;</td>';
+		print '<td width="50">&nbsp;</td>';
 		print '</tr>';
 
 		$var = true;