From d2c71fbf8f8ee7354e2d22268c72a0adb1c447d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Feb 2016 10:35:18 +0100
Subject: [PATCH] Fix alias name was visible twice.

---
 htdocs/societe/soc.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index dc2d6b6a516..c4fb84fa30f 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -980,6 +980,10 @@ else
             print '<td colspan=2>&nbsp;</td></tr>';
         }
 
+        // Alias names (commercial, trademark or alias names)
+        print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
+	    print '<td colspan="3"><input type="text" size="60" name="name_alias" id="name_alias_input" value="'.$object->name_alias.'" size="32"></td></tr>';
+
         // Prospect/Customer
         print '<tr><td width="25%">'.fieldLabel('ProspectCustomer','customerprospect',1).'</td>';
 	    print '<td width="25%" class="maxwidthonsmartphone"><select class="flat" name="client" id="customerprospect">';
@@ -1034,10 +1038,6 @@ else
             print '</td></tr>';
         }
 
-        // Alias names (commercial, trademark or alias names)
-        print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
-	    print '<td colspan="3"><input type="text" name="name_alias" id="name_alias_input" value="'.$object->name_alias.'" size="32"></td></tr>';
-
         // Address
         print '<tr><td class="tdtop">'.fieldLabel('Address','address').'</td>';
 	    print '<td colspan="3"><textarea name="address" id="address" cols="80" rows="'._ROWS_2.'" wrap="soft">';
@@ -1484,7 +1484,7 @@ else
 
 	        // Alias names (commercial, trademark or alias names)
 	        print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
-	        print '<td colspan="3"><input type="text" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'" size="32"></td></tr>';
+	        print '<td colspan="3"><input type="text" size="60" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
             // Prefix
             if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
@@ -1904,11 +1904,6 @@ else
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 
-	    // Alias names (commercial, trademark or alias names)
-	    print '<tr><td class="titlefield" width="25%">'.$langs->trans('AliasNames').'</td><td>';
-	    print $object->name_alias;
-	    print "</td></tr>";
-
     	// Prospect/Customer
     	print '<tr><td>'.$langs->trans('ProspectCustomer').'</td><td>';
     	print $object->getLibCustProspStatut();