From 53c5e6af4457cad31f66e66c81c7ff4147b5eb87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 12 Feb 2006 16:30:43 +0000
Subject: [PATCH] =?UTF-8?q?Look:=20Uniformisation=20formulaire=20propal.?=
 =?UTF-8?q?=20La=20ref=20est=20donn=E9e=20toujours=20en=20premi=E8re=20lig?=
 =?UTF-8?q?ne.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/propal.php        | 5 ++++-
 htdocs/comm/propal/apercu.php | 7 ++++---
 htdocs/comm/propal/info.php   | 9 ++++-----
 htdocs/comm/propal/note.php   | 4 +++-
 htdocs/compta/propal.php      | 7 +++++--
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index c28090aedd1..ca4f5c7e3bc 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -422,7 +422,7 @@ if ($_GET['propalid'] > 0)
   $head[$h][1] = $langs->trans('Documents');
   $h++;
 
-  dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal').': '.$propal->ref);
+  dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal'));
 
   /*
    * Confirmation de la suppression de la propale
@@ -464,6 +464,9 @@ if ($_GET['propalid'] > 0)
             $societe->fetch($obj->idp);
     
             print '<table class="border" width="100%">';
+
+	        print '<tr><td>'.$langs->trans('Ref').'</td><td colspan="5">'.$propal->ref_url.'</td></tr>';
+
             $rowspan=6;
             
             // Société
diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
index 8d5f2401be2..a08981bff25 100644
--- a/htdocs/comm/propal/apercu.php
+++ b/htdocs/comm/propal/apercu.php
@@ -104,7 +104,7 @@ if ($_GET["propalid"] > 0) {
 		$head[$h][1] = $langs->trans('Documents');
 		$h++;
 
-		dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal').': '.$propal->ref);
+		dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal'));
 
 
 		/*
@@ -119,8 +119,6 @@ if ($_GET["propalid"] > 0) {
 		$result = $db->query($sql);
 
 
-
-
 		if ($result) {
 			if ($db->num_rows($result)) {
 				$obj = $db->fetch_object($result);
@@ -129,6 +127,9 @@ if ($_GET["propalid"] > 0) {
 				$societe->fetch($obj->idp);
 
 				print '<table class="border" width="100%">';
+
+		        print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="5">'.$propal->ref_url.'</td></tr>';
+
 				$rowspan=3;
 				// ligne 1
 				// partie Gauche
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index 8f58e971c8c..fdfeb7ebe60 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005 Regis Houssin        <regis.houssin@cap-networks.com>
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Regis Houssin        <regis.houssin@cap-networks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -87,7 +86,7 @@ $head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?propalid='.$propal->id;
 $head[$h][1] = $langs->trans('Documents');
 $h++;
 
-dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal').': '.$propal->ref);
+dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal'));
 
 $propal->info($propal->id);
 
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 257d2f5b82e..c9c39cfda97 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -139,10 +139,12 @@ if ($_GET['propalid'])
 			$head[$h][1] = $langs->trans('Documents');
 			$h++;
 
-			dolibarr_fiche_head($head, $hselected, $langs->trans("Proposal").": $propal->ref");
+			dolibarr_fiche_head($head, $hselected, $langs->trans("Proposal"));
 
             print '<table class="border" width="100%">';
 
+	        print '<tr><td>'.$langs->trans('Ref').'</td><td colspan="3">'.$propal->ref_url.'</td></tr>';
+
             print '<tr><td>'.$langs->trans('Company').'</td><td>';
             if ($societe->client == 1)
             {
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index d39fc4abef9..dd1cb27e5b9 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -96,7 +96,7 @@ $html = new Form($db);
  */
 if ($_GET["propalid"] > 0)
 {
-  	if ($msg) print "$msg<br>";
+  	if ($mesg) print "$mesg<br>";
 
     $propal = new Propal($db);
     $propal->fetch($_GET["propalid"]);
@@ -130,7 +130,7 @@ if ($_GET["propalid"] > 0)
     $head[$h][1] = $langs->trans('Documents');
     $h++;
     
-    dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal').': '.$propal->ref);
+    dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal'));
     
     
     /*
@@ -154,6 +154,9 @@ if ($_GET["propalid"] > 0)
             $societe->fetch($obj->idp);
     
             print '<table class="border" width="100%">';
+
+	        print '<tr><td>'.$langs->trans('Ref').'</td><td colspan="5">'.$propal->ref_url.'</td></tr>';
+
             $rowspan=6;
             
             // Société