From 05fa07bc4d7b183a8dc07d7416e30c67c4b410e3 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 24 Apr 2006 16:33:54 +0000
Subject: [PATCH] Fix: mise en page

---
 htdocs/comm/addpropal.php | 5 +++--
 htdocs/comm/propal.php    | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index 2512226d570..aef0dd3943f 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -162,7 +162,7 @@ if ($_GET["action"] == 'create')
 	if ($conf->global->PROPAL_ADD_SHIPPING_DATE)
 	{
 		print '<tr><td>'.$langs->trans("DateDelivery").'</td>';
-		print '<td>';
+		print '<td colspan="2">';
 		if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "")
 		{
 			$tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
@@ -181,7 +181,8 @@ if ($_GET["action"] == 'create')
 	// Adresse de livraison
 	if ($conf->global->PROPAL_ADD_DELIVERY_ADDRESS)
 	{
-		print '<tr><td>'.$langs->trans('DeliveryAddress').'</td><td>';
+		print '<tr><td>'.$langs->trans('DeliveryAddress').'</td>';
+		print '<td colspan="3">';
 		$numaddress = $html->select_adresse_livraison($soc->adresse_livraison_id, $_GET['socidp'],'adresse_livraison_id');
 		if ($numaddress==0)
 		{
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 8fd9270a449..61cc1413d7a 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -589,6 +589,7 @@ if ($_GET['propalid'] > 0)
 
             if ($conf->projet->enabled) $rowspan++;
             if ($conf->global->PROPAL_ADD_SHIPPING_DATE) $rowspan++;
+            if ($conf->global->PROPAL_ADD_DELIVERY_ADDRESS) $rowspan++;
     
             // Notes
             print '<td valign="top" colspan="2" width="50%" rowspan="'.$rowspan.'">'.$langs->trans('NotePublic').' :<br>'. nl2br($propal->note_public).'</td>';