From 4f0830629a022fb81cdfbf08cbf98d333d7f718b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 8 Sep 2011 21:28:57 +0000
Subject: [PATCH] Look: Uniformize look and feel

---
 htdocs/comm/fiche.php  |  4 ++--
 htdocs/comm/remise.php |  3 ++-
 htdocs/comm/remx.php   | 10 ++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index dcb6fbc4e94..98cb3494a8b 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -335,7 +335,7 @@ if ($socid > 0)
 		print '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$objsoc->id.'">'.img_edit($langs->trans("Modify")).'</a>';
 	}
 	print '</td></tr></table>';
-	print '</td><td colspan="3">'.($objsoc->remise_client?$objsoc->remise_client.'%':$langs->trans("DiscountNone")).'</td>';
+	print '</td><td colspan="3">'.($objsoc->remise_client?'<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$objsoc->id.'">'.$objsoc->remise_client.'%</a>':$langs->trans("DiscountNone")).'</td>';
 	print '</tr>';
 
 	// Absolute discounts (Discounts-Drawbacks-Rebates)
@@ -353,7 +353,7 @@ if ($socid > 0)
 	print '<td colspan="3">';
 	$amount_discount=$objsoc->getAvailableDiscounts();
 	if ($amount_discount < 0) dol_print_error($db,$societe->error);
-	if ($amount_discount > 0) print price($amount_discount).'&nbsp;'.$langs->trans("Currency".$conf->monnaie);
+	if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$objsoc->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$objsoc->id).'">'.price($amount_discount).'</a>&nbsp;'.$langs->trans("Currency".$conf->monnaie);
 	else print $langs->trans("DiscountNone");
 	print '</td>';
 	print '</tr>';
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index d0bddb30d58..20ae7061a33 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -127,7 +127,8 @@ if ($_socid > 0)
 
 	print "</form>";
 
-	print "</div>\n";
+	dol_fiche_end();
+
 	print '<br>';
 
 
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 3a054a1b5e4..5893dcd16d3 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -274,18 +274,20 @@ if ($_socid > 0)
 	print '<tr><td>'.$langs->trans("NoteReason").'</td>';
 	print '<td><input type="text" size="60" name="desc" value="'.$_POST["desc"].'"></td></tr>';
 
-	print '<tr><td align="center" colspan="2">';
+	print "</table>";
+
+	print '<center>';
 	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("AddGlobalDiscount").'">';
     if (GETPOST("backtopage"))
     {
         print '&nbsp; &nbsp; ';
 	    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
     }
-	print '</td></tr>';
+	print '</center>';
 
-	print "</table></form>";
+	print '</form>';
 
-	print "</div>\n";
+	dol_fiche_end();
 
 	print '<br>';