From 453c80e75b2700571c2a8a54d239c0039131e068 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Tue, 5 Feb 2019 20:49:28 +0000
Subject: [PATCH] Display contact sub type always

---
 templates/CRM/Contact/Form/Edit/Household.tpl | 28 ++++++-------
 .../CRM/Contact/Form/Edit/Organization.tpl    | 42 ++++++++++---------
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/templates/CRM/Contact/Form/Edit/Household.tpl b/templates/CRM/Contact/Form/Edit/Household.tpl
index 9cb855705d..8f679031bc 100644
--- a/templates/CRM/Contact/Form/Edit/Household.tpl
+++ b/templates/CRM/Contact/Form/Edit/Household.tpl
@@ -25,18 +25,18 @@
 *}
 {* tpl for building Household related fields *}
 <table class="form-layout-compressed">
-    <tr>
-       <td>{$form.household_name.label}<br/>
-         {$form.household_name.html}
-       </td>
-
-       <td>{$form.nick_name.label}<br/>
-       {$form.nick_name.html}</td>
-
-       <td>{if $action == 1 and $contactSubType}&nbsp;{else}
-              {$form.contact_sub_type.label}<br />
-              {$form.contact_sub_type.html}
-           {/if}
-       </td>
-     </tr>
+  <tr>
+    <td>
+      {$form.household_name.label}<br/>
+      {$form.household_name.html}
+    </td>
+    <td>
+      {$form.nick_name.label}<br/>
+      {$form.nick_name.html}
+    </td>
+    <td>
+      {$form.contact_sub_type.label}<br />
+      {$form.contact_sub_type.html}
+    </td>
+  </tr>
 </table>
diff --git a/templates/CRM/Contact/Form/Edit/Organization.tpl b/templates/CRM/Contact/Form/Edit/Organization.tpl
index 94a1503abe..d1254f8084 100644
--- a/templates/CRM/Contact/Form/Edit/Organization.tpl
+++ b/templates/CRM/Contact/Form/Edit/Organization.tpl
@@ -25,24 +25,26 @@
 *}
 {* tpl for building Organization related fields *}
 <table class="form-layout-compressed">
-    <tr>
-       <td>{$form.organization_name.label}<br/>
-         {$form.organization_name.html}
-       </td>
-
-       <td>{$form.legal_name.label}<br/>
-       {$form.legal_name.html}</td>
-
-       <td>{$form.nick_name.label}<br/>
-       {$form.nick_name.html}</td>
-
-       <td>{$form.sic_code.label}<br/>
-       {$form.sic_code.html}</td>
-
-       <td>{if $action == 1 and $contactSubType}&nbsp;{else}
-              {$form.contact_sub_type.label}<br />
-              {$form.contact_sub_type.html}
-           {/if}
-       </td>
-     </tr>
+  <tr>
+    <td>{
+      $form.organization_name.label}<br/>
+      {$form.organization_name.html}
+    </td>
+    <td>
+      {$form.legal_name.label}<br/>
+      {$form.legal_name.html}
+    </td>
+    <td>
+      {$form.nick_name.label}<br/>
+      {$form.nick_name.html}
+    </td>
+    <td>
+      {$form.sic_code.label}<br/>
+      {$form.sic_code.html}
+    </td>
+    <td>
+      {$form.contact_sub_type.label}<br />
+      {$form.contact_sub_type.html}
+    </td>
+  </tr>
 </table>
-- 
2.25.1