From 76e6fc291428d2a22f5e2703e04fad56c707e174 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Tue, 14 Jul 2015 18:19:12 +0530
Subject: [PATCH] --moved checkbox for Enable-Disable ACL-FT

---
 templates/CRM/Form/basicForm.tpl | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/templates/CRM/Form/basicForm.tpl b/templates/CRM/Form/basicForm.tpl
index cbc6e60bbf..28deca039d 100644
--- a/templates/CRM/Form/basicForm.tpl
+++ b/templates/CRM/Form/basicForm.tpl
@@ -26,6 +26,7 @@
 <div class="crm-block crm-form-block crm-{$formName}-block">
     <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     {if $formName == "Contribute_Preferences" }
+<<<<<<< HEAD
       <table class = "form-layout">
         <tr class="crm-miscellaneous-form-block-cvv-backoffice-required">
           <td class="label">{$form.cvv_backoffice_required.label}</td>
@@ -34,6 +35,12 @@
             <p class="description">{ts}{$cvv_backoffice_required_description}{/ts}</p>
           </td>
         </tr>
+        <tr class="crm-preferences-form-block-acl_financial_type">
+          <td class="label">{$form.acl_financial_type.label}&nbsp;{help id="acl_financial_type"}</td>
+          <td>
+            {$form.acl_financial_type.html}
+          </td>
+        </tr>
         {if $formName == "Contribute_Preferences" }
           <tr class="crm-preferences-form-block-invoicing">
             <td class="label">{$form.invoicing.label}</td>
@@ -42,11 +49,6 @@
             </td>
           </tr>
         {/if}
-        <tr class="crm-preferences-form-block-acl_financial_type">
-          <td>
-            {$form.acl_financial_type.html} {$form.acl_financial_type.label}&nbsp;{help id="acl_financial_type"}
-          </td>
-        </tr>
       </table>
     {/if}
     <table class="form-layout" id="invoicing_blocks">
-- 
2.25.1