From 8a3fbf953316eb0604d74074bd21a41c6c322427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Fri, 11 Jul 2014 20:04:18 +0200
Subject: [PATCH] Mutualized common code

---
 htdocs/societe/soc.php | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 1308ba24f52..aad647ec649 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -802,30 +802,23 @@ else
         print '<table class="border" width="100%">';
 
         // Name, firstname
+	    print '<tr><td>';
         if ($object->particulier || $private)
         {
-            print '<tr><td>';
 	        print '<label for="name"><span id="TypeName" class="fieldrequired">'.$langs->trans('LastName').'</span></label>';
-		    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
-	        print '<input type="text" size="30" maxlength="60" name="nom" id="name" value="'.$object->name.'"></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="'.$object->prefix_comm.'"></td>';
-            }
-            print '</tr>';
         }
         else
 		{
-            print '<tr><td>';
 			print '<label for="name"><span span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').'</span></label>';
-			print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
-			print '<input type="text" size="30" maxlength="60" name="nom" id="nom" value="'.$object->name.'"></td>';
-            if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field1
-            {
-                print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
-            }
-            print '</tr>';
         }
+	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
+	    print '<input type="text" size="30" maxlength="60" name="nom" id="nom" value="'.$object->name.'"></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="'.$object->prefix_comm.'"></td>';
+	    }
+	    print '</tr>';
+
         // If javascript on, we show option individual
         if ($conf->use_javascript_ajax)
         {