From f7ca6e4d4b551d62fb51c1a757a96f7d69b4eeaf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 12 Feb 2011 22:21:30 +0000
Subject: [PATCH] Qual: Better management of option SOCIETE_USEPREFIX

---
 htdocs/societe/soc.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 8dbb542eb7d..ac977116fca 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -665,22 +665,20 @@ else
 		// Name, firstname
 		if ($soc->particulier)
 		{
-			print '<tr><td><span class="fieldrequired">'.$langs->trans('LastName').'</span></td><td><input type="text" size="30" maxlength="60" name="nom" value="'.$soc->nom.'"></td>';
+			print '<tr><td><span class="fieldrequired">'.$langs->trans('LastName').'</span></td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'><input type="text" size="30" maxlength="60" name="nom" value="'.$soc->nom.'"></td>';
             if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
             {
                 print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td>';
             }
-            else print '<td>&nbsp;</td>';
 			print '</tr>';
 		}
 		else
 		{
-			print '<tr><td><span class="fieldrequired">'.$langs->trans('ThirdPartyName').'</span></td><td><input type="text" size="30" maxlength="60" name="nom" value="'.$soc->nom.'"></td>';
+			print '<tr><td><span class="fieldrequired">'.$langs->trans('ThirdPartyName').'</span></td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'><input type="text" size="30" maxlength="60" name="nom" value="'.$soc->nom.'"></td>';
             if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
             {
                 print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td>';
             }
-            else print '<td>&nbsp;</td>';
 			print '</tr>';
 		}
 		// If javascript on, we show option individual