Fix: restore broken feature

Dolibarr · Jan 10, 2018 · 4cc0e88 · 4cc0e88
1 parent bd1acca
commit 4cc0e88
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
@@ -2477,11 +2477,11 @@
 	            print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
 	        }
 
-	        // Subsidiaries list
-	        if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
-	        {
-	        	$result=show_subsidiaries($conf,$langs,$db,$object);
-	        }
+			// Subsidiaries list
+			if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
+			{
+				$result=show_subsidiaries($conf,$langs,$db,$object);
+			}
 
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
@@ -2497,6 +2497,21 @@
 			$somethingshown = $formactions->showactions($object, '', $socid, 1, '', $MAXEVENT, '', $morehtmlright);		// Show all action for thirdparty
 
 			print '</div></div></div>';
+
+			if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+			{
+				// Contacts list
+				if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+				{
+					$result=show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+				}
+
+				// Addresses list
+				if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
+				{
+					$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+				}
+			}
 		}
 
 		// Presend form