CRM-21019, Changed column labels

----------------------------------------
* CRM-21019: Change column labels
  https://issues.civicrm.org/jira/browse/CRM-21019

changed labels

fixed labels

diff --git a/CRM/Financial/Form/BatchTransaction.php b/CRM/Financial/Form/BatchTransaction.php
index 457a739b527ba0d192b8438da541fc089ade7084..4742c1443a8a46517bf241af4845c8da659c82a8 100644 (file)
--- a/CRM/Financial/Form/BatchTransaction.php
+++ b/CRM/Financial/Form/BatchTransaction.php
@@ -76,10 +76,10 @@ class CRM_Financial_Form_BatchTransaction extends CRM_Contribute_Form {
         'status' => ts('Status'),
         'description' => ts('Description'),
         'payment_instrument' => ts('Payment Method'),
-        'item_count' => ts('Entered Transactions'),
-        'assigned_item_count' => ts('Assigned Transactions'),
-        'total' => ts('Entered Total'),
-        'assigned_total' => ts('Assigned Total'),
+        'item_count' => ts('Total Batch Count'),
+        'assigned_item_count' => ts('Actual Batch Count'),
+        'total' => ts('Batch Total Amount'),
+        'assigned_total' => ts('Actual Batch Total Amount'),
         'opened_date' => ts('Opened'),
       );
       $this->assign('columnHeaders', $columnHeaders);

diff --git a/templates/CRM/Financial/Form/BatchTransaction.tpl b/templates/CRM/Financial/Form/BatchTransaction.tpl
index b453ed9e0356686defc92e9fe63c398cee7045cf..95fd984f0761c6af54db9ddb2e8e8e9a7d1bb1c9 100644 (file)
--- a/templates/CRM/Financial/Form/BatchTransaction.tpl
+++ b/templates/CRM/Financial/Form/BatchTransaction.tpl
@@ -75,8 +75,8 @@
         <th class="crm-contact-name">{ts}Name{/ts}</th>
         <th class="crm-amount">{ts}Amount{/ts}</th>
         <th class="crm-trxnID">{ts}Trxn ID{/ts}</th>
-        <th class="crm-trxn_date">{ts}Transaction Date{/ts}</th>
-        <th class="crm-received">{ts}Received{/ts}</th>
+        <th class="crm-trxn_date">{ts}Payment/Transaction Date{/ts}</th>
+        <th class="crm-received">{ts}Contribution Date{/ts}</th>
         <th class="crm-payment-method">{ts}Pay Method{/ts}</th>
         <th class="crm-status">{ts}Status{/ts}</th>
         <th class="crm-type">{ts}Financial Type{/ts}</th>

diff --git a/templates/CRM/Financial/Page/BatchTransaction.tpl b/templates/CRM/Financial/Page/BatchTransaction.tpl
index 6047115d8461b6d8297e9ada98cd000d5043bf09..43098c7e47d9cf27cbd22b1ee609d4721af811b8 100644 (file)
--- a/templates/CRM/Financial/Page/BatchTransaction.tpl
+++ b/templates/CRM/Financial/Page/BatchTransaction.tpl
@@ -60,8 +60,8 @@
           <th class="crm-contact-name">{ts}Name{/ts}</th>
           <th class="crm-amount">{ts}Amount{/ts}</th>
           <th class="crm-trxnID">{ts}Trxn ID{/ts}</th>
-          <th class="crm-trxn_date">{ts}Transaction Date{/ts}</th>
-          <th class="crm-received">{ts}Received{/ts}</th>
+          <th class="crm-trxn_date">{ts}Payment/Transaction Date{/ts}</th>
+          <th class="crm-received">{ts}Contribution Date{/ts}</th>
           <th class="crm-payment-method">{ts}Pay Method{/ts}</th>
           <th class="crm-status">{ts}Status{/ts}</th>
           <th class="crm-type">{ts}Type{/ts}</th>