CRM-14078 - Consolodate contribution 'Date Received' field label

diff --git a/CRM/Contribute/Form/AdditionalPayment.php b/CRM/Contribute/Form/AdditionalPayment.php
index 05be49a28bbb931efeffd220653238ad1a4b05c5..234c3a0c3cbe8b522a10f42f74140b3d64ce2d51 100644 (file)
--- a/CRM/Contribute/Form/AdditionalPayment.php
+++ b/CRM/Contribute/Form/AdditionalPayment.php
@@ -287,7 +287,7 @@ class CRM_Contribute_Form_AdditionalPayment extends CRM_Contribute_Form_Abstract
     $this->add('textarea', 'receipt_text', ts('Confirmation Message'));
 
     // add various dates
-    $dateLabel = ($this->_refund) ? ts('Refund Date') : ts('Received Date');
+    $dateLabel = ($this->_refund) ? ts('Refund Date') : ts('Date Received');
     $this->addDateTime('trxn_date', $dateLabel, FALSE, array('formatType' => 'activityDateTime'));
 
     if ($this->_contactId && $this->_id) {

diff --git a/CRM/Core/BAO/UFField.php b/CRM/Core/BAO/UFField.php
index 5b6204053c4ea4753ec6f0a5f9c3ce13b05dd66d..bcc9ebff73b4514eccef98712f9f95c7abc6b021 100644 (file)
--- a/CRM/Core/BAO/UFField.php
+++ b/CRM/Core/BAO/UFField.php
@@ -1137,7 +1137,7 @@ SELECT  id
         ),
         'receive_date' => array(
           'name' => 'receive_date',
-          'title' => ts('Receive Date'),
+          'title' => ts('Date Received'),
         ),
         'payment_instrument' => array(
           'name' => 'payment_instrument',

diff --git a/CRM/Core/SelectValues.php b/CRM/Core/SelectValues.php
index 6c2a9fb5380b6b31f038754d1667856b2660497a..072dbd4bf4ae7b37b7203b1bd57a9bdec9531851 100644 (file)
--- a/CRM/Core/SelectValues.php
+++ b/CRM/Core/SelectValues.php
@@ -553,7 +553,7 @@ class CRM_Core_SelectValues {
       '{contribution.fee_amount}' => ts('Fee Amount'),
       '{contribution.net_amount}' => ts('Net Amount'),
       '{contribution.non_deductible_amount}' => ts('Non-deductible Amount'),
-      '{contribution.receive_date}' => ts('Contribution Receive Date'),
+      '{contribution.receive_date}' => ts('Contribution Date Received'),
       '{contribution.payment_instrument}' => ts('Payment Instrument'),
       '{contribution.trxn_id}' => ts('Transaction ID'),
       '{contribution.invoice_id}' => ts('Invoice ID'),

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index 41c83b3081b817db9065c4e6dbd8df8fe7b6017b..42d6360b25b82d313359538b1f18ae35773db583 100644 (file)
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -2038,7 +2038,7 @@ WHERE  {$whereClause}";
       $componentPaymentFields = array(
         'componentPaymentField_total_amount' => ts('Total Amount'),
         'componentPaymentField_contribution_status' => ts('Contribution Status'),
-        'componentPaymentField_received_date' => ts('Received Date'),
+        'componentPaymentField_received_date' => ts('Date Received'),
         'componentPaymentField_payment_instrument' => ts('Payment Instrument'),
         'componentPaymentField_transaction_id' => ts('Transaction ID'),
       );

diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php
index 72f848fc516c6c56dbb48660229715284dd63037..23c7ac944c547be343b437e3b503594deaa6471d 100644 (file)
--- a/CRM/Report/Form/Contribute/Detail.php
+++ b/CRM/Report/Form/Contribute/Detail.php
@@ -283,7 +283,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
           'financial_type_id' => array('title' => ts('Financial Type')),
           'contribution_status_id' => array('title' => ts('Contribution Status')),
           'payment_instrument_id' => array('title' => ts('Payment Instrument')),
-          'receive_date' => array('title' => ts('Receive Date')),
+          'receive_date' => array('title' => ts('Date Received')),
         ),
         'grouping' => 'contri-fields',
       ),

diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php
index d5fb73c29d27f846dca83f5723876f0033877a3d..1c6bdbd91d870a9088784d272c2b157535536b5f 100644 (file)
--- a/CRM/Report/Form/Member/Detail.php
+++ b/CRM/Report/Form/Member/Detail.php
@@ -264,7 +264,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form {
         ),
         'order_bys' => array(
           'receive_date' => array(
-            'title' => ts('Receive Date'),
+            'title' => ts('Date Received'),
             'default_weight' => '2',
             'default_order' => 'DESC',
           ),

diff --git a/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_html.tpl b/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_html.tpl
index 78de6adb7c5519d69d7e8130c5fd9c1cce4be7f1..9e4b6d29d66cb514b6ed368241ecb4c30d5dc609 100644 (file)
--- a/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_html.tpl
+++ b/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_html.tpl
@@ -18,7 +18,7 @@
     {/if}
   </p>
   <table width="620" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
-    <tr><td>{ts}Receive Date{/ts}:</td><td> {$receive_date|crmDate}</td></tr>
+    <tr><td>{ts}Received{/ts}:</td><td> {$receive_date|crmDate}</td></tr>
     <tr><td>{ts}Amount{/ts}:</td><td> {$total_amount|crmMoney:$currency}</td></tr>
     <tr><td>{ts}Name{/ts}:</td><td> {$donors_display_name}</td></tr>
     <tr><td>{ts}Email{/ts}:</td><td> {$donors_email}</td></tr>

diff --git a/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_text.tpl b/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_text.tpl
index ea9ae9b2c231e0c29b297a544e444690a6978aa5..4c7f7841afc62385dbccb70149426758e4511e87 100644 (file)
--- a/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_text.tpl
+++ b/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_text.tpl
@@ -11,7 +11,7 @@
     {ts}The donor's name has been added to your honor roll unless they asked not to be included.{/ts}
 {/if}
 
-{ts}Receive Date{/ts}: {$receive_date|crmDate}
+{ts}Received{/ts}: {$receive_date|crmDate}
 
 {ts}Amount{/ts}: {$total_amount|crmMoney:$currency}
 

diff --git a/templates/CRM/Contribute/Form/Search/Common.tpl b/templates/CRM/Contribute/Form/Search/Common.tpl
index 056b65c142973ea8a33e7b3aae6af5a2919758f4..b06d5ac0b757d1ba5fb762bd6a69657b04947717 100644 (file)
--- a/templates/CRM/Contribute/Form/Search/Common.tpl
+++ b/templates/CRM/Contribute/Form/Search/Common.tpl
@@ -24,7 +24,7 @@
  +--------------------------------------------------------------------+
 *}
 
-<tr><td><label>{ts}Contribution Dates{/ts}</label></td></tr>
+<tr><td><label>{ts}Date Received{/ts}</label></td></tr>
 <tr>
 {include file="CRM/Core/DateRange.tpl" fieldName="contribution_date" from='_low' to='_high'}
 </tr>

diff --git a/tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php b/tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php
index fd378de339d978ea82f456a588864ed70a77fda9..97732afbcb31105e7d68148bec68aa2a9bbf8e5f 100644 (file)
--- a/tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php
+++ b/tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php
@@ -289,7 +289,7 @@ class WebTest_Contact_SearchbyDateFilterTest extends CiviSeleniumTestCase {
           'bodyLocator' => 'select#financial_type_id',
           'title' => 'Contributions',
           'fields' => array(
-            'Contribution Dates' => array(
+            'Date Received' => array(
               'type' => 'select',
               'locator' => 'contribution_date_relative',
               'values' => array('Today'),
@@ -301,7 +301,7 @@ class WebTest_Contact_SearchbyDateFilterTest extends CiviSeleniumTestCase {
           'bodyLocator' => 'select#pledge_payment_date_relative',
           'title' => 'Pledges',
           'fields' => array(
-            'Contribution Dates' => array(
+            'Date Received' => array(
               'type' => 'select',
               'locator' => 'pledge_payment_date_relative',
               'values' => array('Prior to Previous Month'),

diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml
index e7b166204e8cccef54f929170c42dab95d2b99df..02f271a097444ff9adf0216696e500cd23cd6736 100644 (file)
--- a/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@ -140,11 +140,12 @@
   </index>
   <field>
     <name>receive_date</name>
+    <title>Date Received</title>
     <type>datetime</type>
     <import>true</import>
     <headerPattern>/receive(.?date)?/i</headerPattern>
     <dataPattern>/^\d{4}-?\d{2}-?\d{2} ?(\d{2}:?\d{2}:?(\d{2})?)?$/</dataPattern>
-    <comment>when was gift received</comment>
+    <comment>Date contribution was received - not necessarily the creation date of the record</comment>
     <add>1.3</add>
     <html>
      <type>Select Date</type>

diff --git a/xml/templates/message_templates/contribution_offline_receipt_html.tpl b/xml/templates/message_templates/contribution_offline_receipt_html.tpl
index af1145a26ed7781e09493f3de58693b9e47c9cb7..8a840cef62c24540b60a62cbc006c9273a99c285 100644 (file)
--- a/xml/templates/message_templates/contribution_offline_receipt_html.tpl
+++ b/xml/templates/message_templates/contribution_offline_receipt_html.tpl
@@ -148,7 +148,7 @@
      {if $receive_date}
       <tr>
        <td {$labelStyle}>
-        {ts}Received Date{/ts}
+        {ts}Date Received{/ts}
        </td>
        <td {$valueStyle}>
         {$receive_date|truncate:10:''|crmDate}

diff --git a/xml/templates/message_templates/contribution_offline_receipt_text.tpl b/xml/templates/message_templates/contribution_offline_receipt_text.tpl
index cb3547a089a8866fac4f5f2d7ae38b08933c8265..6b46e34259eb30e24c93751578b388379b7497c7 100644 (file)
--- a/xml/templates/message_templates/contribution_offline_receipt_text.tpl
+++ b/xml/templates/message_templates/contribution_offline_receipt_text.tpl
@@ -47,7 +47,7 @@
 {/if}
 {ts}Total Amount{/ts} : {$formValues.total_amount|crmMoney:$currency}
 {if $receive_date}
-{ts}Received Date{/ts}: {$receive_date|truncate:10:''|crmDate}
+{ts}Date Received{/ts}: {$receive_date|truncate:10:''|crmDate}
 {/if}
 {if $receipt_date}
 {ts}Receipt Date{/ts}: {$receipt_date|truncate:10:''|crmDate}

diff --git a/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl
index 2abdab7c543d4d586c11591669316a9be62294b3..8d5347a721c63b6f5db75bfff01f02f484030c1f 100644 (file)
--- a/xml/templates/message_templates/membership_offline_receipt_html.tpl
+++ b/xml/templates/message_templates/membership_offline_receipt_html.tpl
@@ -186,7 +186,7 @@
        {if $receive_date}
         <tr>
          <td {$labelStyle}>
-          {ts}Received Date{/ts}
+          {ts}Date Received{/ts}
          </td>
          <td {$valueStyle}>
           {$receive_date|truncate:10:''|crmDate}

diff --git a/xml/templates/message_templates/membership_offline_receipt_text.tpl b/xml/templates/message_templates/membership_offline_receipt_text.tpl
index 0254609ceb4dcadce2499edaaa183eef70bdb67c..7df285af46b28f39eb8259867d826bd9259f658b 100644 (file)
--- a/xml/templates/message_templates/membership_offline_receipt_text.tpl
+++ b/xml/templates/message_templates/membership_offline_receipt_text.tpl
@@ -69,7 +69,7 @@
 
 {ts}Amount{/ts}: {$formValues.total_amount|crmMoney}
 {if $receive_date}
-{ts}Received Date{/ts}: {$receive_date|truncate:10:''|crmDate}
+{ts}Date Received{/ts}: {$receive_date|truncate:10:''|crmDate}
 {/if}
 {if $formValues.paidBy}
 {ts}Paid By{/ts}: {$formValues.paidBy}

diff --git a/xml/templates/message_templates/pcp_owner_notify_html.tpl b/xml/templates/message_templates/pcp_owner_notify_html.tpl
index 78de6adb7c5519d69d7e8130c5fd9c1cce4be7f1..9e4b6d29d66cb514b6ed368241ecb4c30d5dc609 100644 (file)
--- a/xml/templates/message_templates/pcp_owner_notify_html.tpl
+++ b/xml/templates/message_templates/pcp_owner_notify_html.tpl
@@ -18,7 +18,7 @@
     {/if}
   </p>
   <table width="620" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
-    <tr><td>{ts}Receive Date{/ts}:</td><td> {$receive_date|crmDate}</td></tr>
+    <tr><td>{ts}Received{/ts}:</td><td> {$receive_date|crmDate}</td></tr>
     <tr><td>{ts}Amount{/ts}:</td><td> {$total_amount|crmMoney:$currency}</td></tr>
     <tr><td>{ts}Name{/ts}:</td><td> {$donors_display_name}</td></tr>
     <tr><td>{ts}Email{/ts}:</td><td> {$donors_email}</td></tr>

diff --git a/xml/templates/message_templates/pcp_owner_notify_text.tpl b/xml/templates/message_templates/pcp_owner_notify_text.tpl
index ea9ae9b2c231e0c29b297a544e444690a6978aa5..4c7f7841afc62385dbccb70149426758e4511e87 100644 (file)
--- a/xml/templates/message_templates/pcp_owner_notify_text.tpl
+++ b/xml/templates/message_templates/pcp_owner_notify_text.tpl
@@ -11,7 +11,7 @@
     {ts}The donor's name has been added to your honor roll unless they asked not to be included.{/ts}
 {/if}
 
-{ts}Receive Date{/ts}: {$receive_date|crmDate}
+{ts}Received{/ts}: {$receive_date|crmDate}
 
 {ts}Amount{/ts}: {$total_amount|crmMoney:$currency}