From 420bfd8301ba8f9b7950338a26014b844e073d2b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 18 Oct 2015 19:09:35 +0200
Subject: [PATCH] FIX Preview pages was not using correct style for ref

---
 htdocs/comm/propal/apercu.php    | 13 ++++++++-----
 htdocs/commande/apercu.php       | 11 ++++++++---
 htdocs/compta/facture/apercu.php | 20 ++++++++++++++++----
 htdocs/fichinter/apercu.php      | 29 +++++++++++++++--------------
 4 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
index 837dc48c670..cdeacefafe1 100644
--- a/htdocs/comm/propal/apercu.php
+++ b/htdocs/comm/propal/apercu.php
@@ -47,8 +47,9 @@ $result = restrictedArea($user, 'propal', $id);
  * View Mode
  */
 
-llxHeader();
+$form = new Form($db);
 
+llxHeader();
 
 if ($id > 0 || ! empty($ref))
 {
@@ -68,10 +69,12 @@ if ($id > 0 || ! empty($ref))
 		 */
         print '<table class="border" width="100%">';
 
-        // Ref
-        print '<tr><td width="25%">'.$langs->trans('Ref').'</td>';
-        print '<td colspan="5">'.$object->ref.'</td>';
-        print '</tr>';
+    	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+    
+    	// Ref
+    	print '<tr><td>' . $langs->trans('Ref') . '</td><td colspan="5">';
+    	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+    	print '</td></tr>';
 
         // Ref client
         print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
index 5d65ba1a493..1ec3a0533cc 100644
--- a/htdocs/commande/apercu.php
+++ b/htdocs/commande/apercu.php
@@ -47,6 +47,8 @@ $result=restrictedArea($user,'commande',$id,'');
  * View Mode
  */
 
+$form = new Form($db);
+
 llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
 
 if ($id > 0 || ! empty($ref))
@@ -64,9 +66,12 @@ if ($id > 0 || ! empty($ref))
 
         print '<table class="border" width="100%">';
 
-        // Ref
-        print '<tr><td width="25%">'.$langs->trans("Ref")."</td>";
-        print '<td colspan="5">'.$object->ref.'</td></tr>';
+    	//$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+    
+    	// Ref
+    	print '<tr><td>' . $langs->trans('Ref') . '</td><td colspan="5">';
+    	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+    	print '</td></tr>';
 
         // Ref cde client
         print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index b649dd43c43..1172769e95a 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -29,6 +29,7 @@
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -79,10 +80,21 @@ if ($id > 0 || ! empty($ref))
          */
         print '<table class="border" width="100%">';
 
-        // Ref
-        print '<tr><td width="25%">'.$langs->trans('Ref').'</td>';
-        print '<td colspan="5">'.$object->ref.'</td>';
-        print '</tr>';
+    	$linkback = '<a href="' . DOL_URL_ROOT . '/compta/facture/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+    
+    	// Ref
+    	print '<tr><td>' . $langs->trans('Ref') . '</td><td colspan="5">';
+    	$morehtmlref = '';
+    	$discount = new DiscountAbsolute($db);
+    	$result = $discount->fetch(0, $object->id);
+    	if ($result > 0) {
+    		$morehtmlref = ' (' . $langs->trans("CreditNoteConvertedIntoDiscount", $discount->getNomUrl(1, 'discount')) . ')';
+    	}
+    	if ($result < 0) {
+    		dol_print_error('', $discount->error);
+    	}
+    	print $form->showrefnav($object, 'ref', $linkback, 1, 'facnumber', 'ref', $morehtmlref);
+    	print '</td></tr>';
 
         // Ref customer
         print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php
index 9e08fae27ab..04ed6b71e19 100644
--- a/htdocs/fichinter/apercu.php
+++ b/htdocs/fichinter/apercu.php
@@ -72,13 +72,21 @@ if ($id > 0 || ! empty($ref))
 		 */
 		print '<table class="border" width="100%">';
 
-		// Ref
-		print '<tr><td width="18%">'.$langs->trans("Ref")."</td>";
-		print '<td colspan="2">'.$object->ref.'</td>';
+    	$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+    
+    	// Ref
+    	print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
+    	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
+    	print '</td></tr>';
 
-		$nbrow=4;
+		$nbrow=3;
+		// Client
+		print "<tr><td>".$langs->trans("Customer")."</td>";
+		print '<td>';
+		print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$soc->id.'">'.$soc->name.'</a>';
+		print '</td>';
 		print '<td rowspan="'.$nbrow.'" valign="top" width="50%">';
-
+		
 		/*
 		 * Documents
 		 */
@@ -141,21 +149,14 @@ if ($id > 0 || ! empty($ref))
 
 		print "</td></tr>";
 
-		// Client
-		print "<tr><td>".$langs->trans("Customer")."</td>";
-		print '<td colspan="2">';
-		print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$soc->id.'">'.$soc->name.'</a>';
-		print '</td>';
-		print '</tr>';
-
 		// Statut
 		print '<tr><td>'.$langs->trans("Status").'</td>';
-		print "<td colspan=\"2\">".$object->getLibStatut(4)."</td>\n";
+		print "<td>".$object->getLibStatut(4)."</td>\n";
 		print '</tr>';
 
 		// Date
 		print '<tr><td>'.$langs->trans("Date").'</td>';
-		print "<td colspan=\"2\">".dol_print_date($object->datec,"daytext")."</td>\n";
+		print "<td>".dol_print_date($object->datec,"daytext")."</td>\n";
 		print '</tr>';
 
 		print '</table>';