Complete usage of option SOCIETE_DISABLE_CONTACTS

htdocs/contact/exportimport.php

@@ -68,6 +68,8 @@ print '<tr><td width="20%">'.$langs->trans("Lastname").' / '.$langs->trans("Labe
 print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="25%">'.$contact->firstname.'</td></tr>';
 
 // Company
+if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+{
     if ($contact->socid > 0)
     {
     	$objsoc = new Societe($db);
@@ -81,6 +83,7 @@ else
     	print $langs->trans("ContactNotLinkedToCompany");
     	print '</td></tr>';
     }
+}
 
 // Civility
 print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';

htdocs/contact/fiche.php

@@ -476,6 +476,8 @@ else
 			print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="30%"><input name="firstname" type="text" size="30" maxlength="80" value="'.(isset($_POST["firstname"])?$_POST["firstname"]:$object->firstname).'"></td></tr>';
 
 			// Company
+            if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+            {
     			if ($socid > 0)
     			{
     				print '<tr><td>'.$langs->trans("Company").'</td>';
@@ -492,6 +494,7 @@ else
     				//print $langs->trans("ContactNotLinkedToCompany");
     				print '</td></tr>';
     			}
+            }
 
 			// Civility
 			print '<tr><td width="15%">'.$langs->trans("UserTitle").'</td><td colspan="3">';
@@ -650,11 +653,14 @@ else
 			print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="30%"><input name="firstname" type="text" size="20" maxlength="80" value="'.(isset($_POST["firstname"])?$_POST["firstname"]:$object->firstname).'"></td></tr>';
 
 			// Company
+            if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+            {
     			print '<tr><td>'.$langs->trans("Company").'</td>';
     			print '<td colspan="3">';
     			print $form->select_societes(isset($_POST["socid"])?$_POST["socid"]:($object->socid?$object->socid:-1),'socid','',1);
     			print '</td>';
     			print '</tr>';
+            }
 
 			// Civility
 			print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
@@ -824,6 +830,8 @@ else
 		print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="30%">'.$object->firstname.'</td></tr>';
 
 		// Company
+        if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+        {
             print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
     		if ($object->socid > 0)
     		{
@@ -835,6 +843,7 @@ else
     			print $langs->trans("ContactNotLinkedToCompany");
     		}
     		print '</td></tr>';
+        }
 
 		// Civility
 		print '<tr><td width="15%">'.$langs->trans("UserTitle").'</td><td colspan="3">';

htdocs/contact/index.php

@@ -227,7 +227,7 @@ if ($result)
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("Lastname"),"index.php","p.name", $begin, $param, '', $sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Firstname"),"index.php","p.firstname", $begin, $param, '', $sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Company"),"index.php","s.nom", $begin, $param, '', $sortfield,$sortorder);
+    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) print_liste_field_titre($langs->trans("Company"),"index.php","s.nom", $begin, $param, '', $sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Phone"),"index.php","p.phone", $begin, $param, '', $sortfield,$sortorder);
     if ($_GET["view"] == 'phone')
     {
@@ -251,9 +251,12 @@ if ($result)
     print '<td class="liste_titre">';
     print '<input class="flat" type="text" name="search_prenom" size="10" value="'.$search_prenom.'">';
     print '</td>';
+    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+    {
         print '<td class="liste_titre">';
         print '<input class="flat" type="text" name="search_societe" size="10" value="'.$search_societe.'">';
         print '</td>';
+    }
     print '<td class="liste_titre">&nbsp;</td>';
     if ($_GET["view"] == 'phone')
     {
@@ -302,6 +305,8 @@ if ($result)
         print '<td>'.dol_trunc($obj->firstname,20).'</td>';
 
 		// Company
+        if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+        {
     		print '<td>';
             if ($obj->socid)
             {
@@ -313,6 +318,7 @@ if ($result)
                 print '&nbsp;';
             }
             print '</td>';
+        }
 
 		// Phone
         print '<td>';

htdocs/contact/perso.php

@@ -107,6 +107,8 @@ if ($_GET["action"] == 'edit')
     print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="30%">'.$contact->prenom.'</td>';
 
     // Company
+    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+    {
         if ($contact->socid > 0)
         {
             $objsoc = new Societe($db);
@@ -120,6 +122,7 @@ if ($_GET["action"] == 'edit')
             print $langs->trans("ContactNotLinkedToCompany");
             print '</td></tr>';
         }
+    }
 
 	// Civility
     print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
@@ -170,6 +173,8 @@ else
     print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="30%">'.$contact->firstname.'</td></tr>';
 
     // Company
+    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+    {
         if ($contact->socid > 0)
         {
             $objsoc = new Societe($db);
@@ -184,6 +189,7 @@ else
             print $langs->trans("ContactNotLinkedToCompany");
             print '</td></tr>';
         }
+    }
 
 	// Civility
     print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';