From 7d6a0a51164984a66bceeef836ddcc7c7d7122af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 14 Jul 2005 23:52:56 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Pb=20alignement=20tableau=20si=20module?=
 =?UTF-8?q?=20porjet=20d=E9sactiv=E9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/propal.php   | 16 +++++++---------
 htdocs/compta/propal.php | 10 +++++-----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 3827640e145..fa186cde5ce 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -28,7 +28,7 @@
         \brief      Page liste des propales (vision commercial)
 */
 
-require('./pre.inc.php');
+require("./pre.inc.php");
 
 $langs->load('companies');
 $langs->load('propal');
@@ -47,9 +47,7 @@ require_once('../propal.class.php');
 require_once('../actioncomm.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php');
 
-/*
- *  Sécurité accés client
- */
+// Sécurité accés client
 if ($user->societe_id > 0) 
 {
 	$action = '';
@@ -433,7 +431,7 @@ if ($_GET['propalid'])
 			$societe->fetch($obj->idp);
 
 			print '<table class="border" width="100%">';
-			$rowspan=7;
+			$rowspan=6;
 			print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">';
 			if ($societe->client == 1)
 			{
@@ -501,14 +499,14 @@ if ($_GET['propalid'])
 			}
 			print '</td>';
 
-			if ($conf->projet->enabled && $propal->projetidp) 
+			if ($conf->projet->enabled) 
 				$rowspan++;
 
 			print '<td valign="top" colspan="2" width="50%" rowspan="'.$rowspan.'">'.$langs->trans('Note').' :<br>'. nl2br($propal->note).'</td></tr>';
 
-			print '<tr><td>'.$langs->trans('Project').'</td>';
 			if ($conf->projet->enabled)
 			{
+    			print '<tr><td>'.$langs->trans('Project').'</td>';
 				$langs->load('projects');
 				$numprojet = $societe->has_projects();
 				print '<td colspan="2">';
@@ -547,8 +545,8 @@ if ($_GET['propalid'])
                         }
 					}
 				}
+    			print '</tr>';
 			}
-			print '</tr>';
 
 			print '<tr><td height="10" nowrap>'.$langs->trans('GlobalDiscount').'</td>';
 			if ($propal->brouillon == 1 && $user->rights->propale->creer)
@@ -563,7 +561,7 @@ if ($_GET['propalid'])
 			}
 			else
 			{
-				print '<td colspan="3">'.$propal->remise_percent.' %</td>';
+				print '<td colspan="3">'.$propal->remise_percent.'%</td>';
 			}
 			print '</tr>';
 
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index 7a99a62601d..62feafbc054 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -34,9 +34,9 @@ $user->getrights('propale');
 if (!$user->rights->propale->lire)
     accessforbidden();
 
+if ($conf->projet->enabled) require_once '../project.class.php';
 if ($conf->commande->enabled) require_once '../commande/commande.class.php';
 require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
-require_once("../project.class.php");
 require_once("../propal.class.php");
 //require_once("../actioncomm.class.php");
 
@@ -141,7 +141,7 @@ if ($_GET["propalid"])
 			$societe->fetch($obj->idp);
 
 			print '<table class="border" width="100%">';
-			$rowspan=7;
+			$rowspan=6;
 			print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">';
 			if ($societe->client == 1)
 			{
@@ -209,14 +209,14 @@ if ($_GET["propalid"])
 			}
 			print '</td>';
 
-			if ($conf->projet->enabled && $propal->projetidp) 
+			if ($conf->projet->enabled) 
 				$rowspan++;
 
 			print '<td valign="top" colspan="2" width="50%" rowspan="'.$rowspan.'">'.$langs->trans('Note').' :<br>'. nl2br($propal->note).'</td></tr>';
 
-			print '<tr><td>'.$langs->trans('Project').'</td>';
 			if ($conf->projet->enabled)
 			{
+    			print '<tr><td>'.$langs->trans('Project').'</td>';
 				$langs->load('projects');
 				$numprojet = $societe->has_projects();
 				print '<td colspan="2">';
@@ -255,8 +255,8 @@ if ($_GET["propalid"])
                         }
 					}
 				}
-			}
 			print '</tr>';
+			}
 
 			print '<tr><td height="10" nowrap>'.$langs->trans('GlobalDiscount').'</td>';
 			if ($propal->brouillon == 1 && $user->rights->propale->creer)