From f590cda386c1542d9c58cdb85b2e8100540914ec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 26 Mar 2006 14:56:21 +0000
Subject: [PATCH] =?UTF-8?q?Look:=20Modif=20esth=E9tique=20mineure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/index.php          |  3 ++-
 htdocs/comm/propal.php         | 32 ++++++++++++++++----------------
 htdocs/theme/eldy/eldy.css.php |  2 +-
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index b2e6dd59b3f..17b63582764 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -157,7 +157,8 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
                 $obj = $db->fetch_object($resql);
                 $var=!$var;
                 print '<tr '.$bc[$var].'><td nowrap>'."<a href=\"".DOL_URL_ROOT."/comm/propal.php?propalid=".$obj->rowid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref.'</a></td>';
-                print '<td><a href="fiche.php?socid='.$obj->idp.'">'.dolibarr_trunc($obj->nom,18).'</a></td><td align="right">'.price($obj->price).'</td></tr>';
+                print '<td><a href="fiche.php?socid='.$obj->idp.'">'.dolibarr_trunc($obj->nom,18).'</a></td>';
+                print '<td align="right" nowrap="nowrap">'.price($obj->price).'</td></tr>';
                 $i++;
                 $total += $obj->price;
             }
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 02cbf2bf7d4..c0e2fb765a2 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -489,14 +489,14 @@ if ($_GET['propalid'] > 0)
    * Fiche propal
    *
    */
-  $sql = 'SELECT s.nom, s.idp, p.price, p.fk_projet, p.remise, p.tva, p.total, p.ref, p.fk_statut, p.fk_cond_reglement, p.fk_mode_reglement, '.$db->pdate('p.datep').' as dp, p.note,';
-  $sql.= ' x.firstname, x.name, x.fax, x.phone, x.email, p.fk_user_author, p.fk_user_valid, p.fk_user_cloture, p.datec, p.date_valid, p.date_cloture';
-  $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'propal as p, '.MAIN_DB_PREFIX.'socpeople as x';
-  $sql.= ' WHERE p.fk_soc = s.idp AND p.fk_soc_contact = x.idp AND p.rowid = '.$propal->id;
-  if ($socidp) $sql .= ' AND s.idp = '.$socidp;
-
-  $resql = $db->query($sql);
-  if ($resql)
+	$sql = 'SELECT s.nom, s.idp, p.price, p.fk_projet, p.remise, p.tva, p.total, p.ref, p.fk_statut, p.fk_cond_reglement, p.fk_mode_reglement, '.$db->pdate('p.datep').' as dp, p.note,';
+	$sql.= ' x.firstname, x.name, x.fax, x.phone, x.email, p.fk_user_author, p.fk_user_valid, p.fk_user_cloture, p.datec, p.date_valid, p.date_cloture';
+	$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'propal as p, '.MAIN_DB_PREFIX.'socpeople as x';
+	$sql.= ' WHERE p.fk_soc = s.idp AND p.fk_soc_contact = x.idp AND p.rowid = '.$propal->id;
+	if ($socidp) $sql .= ' AND s.idp = '.$socidp;
+	
+	$resql = $db->query($sql);
+	if ($resql)
     {
         if ($db->num_rows($resql))
         {
@@ -967,20 +967,20 @@ if ($_GET['propalid'] > 0)
             }
 
             print '</table>';
-    
         }
     }
-  else
+  	else
     {
-      dolibarr_print_error($db);
+    	dolibarr_print_error($db);
     }
   
-  print '</div>';
+	print '</div>';
+	print "\n";
 
-  /*
-   * Formulaire cloture (signé ou non)
-   */
-  if ($_GET['action'] == 'statut') 
+	/*
+ 	 * Formulaire cloture (signé ou non)
+	 */
+  	if ($_GET['action'] == 'statut') 
     {
       print '<form action="propal.php?propalid='.$propal->id.'" method="post">';
       print '<table class="border" width="100%">';
diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php
index 3fa2d51cf13..0a3a9346aa1 100644
--- a/htdocs/theme/eldy/eldy.css.php
+++ b/htdocs/theme/eldy/eldy.css.php
@@ -375,7 +375,7 @@ div.tabBar {
     padding-left: 12px;
     padding-right: 12px;
     padding-bottom: 12px;
-    margin: 0px 0px 50px 0px;
+    margin: 0px 0px 10px 0px;
     -moz-border-radius-topleft:6px;
     -moz-border-radius-topright:6px;
     -moz-border-radius-bottomleft:6px;