Merge pull request #10682 from JMAConsulting/CRM-20890

CRM-20890: Move recieve_date between Contribution status and Revenue Recognition date in Contribution backoffice form
civicrm · Jul 20, 2017 · 79ce1b5 · 79ce1b5
2 parents d171178 + b3f1d25
commit 79ce1b5
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -225,6 +225,12 @@
         </fieldset>
         </td>
       </tr>
+      <tr class="crm-contribution-form-block-receive_date">
+        <td class="label">{$form.receive_date.label}</td>
+        <td {$valueStyle}>{include file="CRM/common/jcalendar.tpl" elementName=receive_date}<br />
+          <span class="description">{ts}The date this contribution was received.{/ts}</span>
+        </td>
+      </tr>
     {/if}
     {if $form.revenue_recognition_date && !$payNow}
       <tr class="crm-contribution-form-block-revenue_recognition_date">
@@ -240,12 +246,6 @@
         {ts}Payment Details{/ts}
       </legend>
         <table class="form-layout-compressed" >
-          <tr class="crm-contribution-form-block-receive_date">
-            <td class="label">{$form.receive_date.label}</td>
-            <td {$valueStyle}>{include file="CRM/common/jcalendar.tpl" elementName=receive_date}<br />
-              <span class="description">{ts}The date this contribution was received.{/ts}</span>
-            </td>
-          </tr>
           <tr class="crm-contribution-form-block-payment_instrument_id">
             <td class="label">{$form.payment_instrument_id.label}</td>
             <td {$valueStyle}>{$form.payment_instrument_id.html} {help id="payment_instrument_id"}</td>