From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Tue, 1 Aug 2017 18:20:01 +0000 (+0530)
Subject: CRM-21019, Changed column labels
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2ae265ea3148a25de2b67389ddfbfd7c9f451763;p=civicrm-core.git

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 457a739b52..4742c1443a 100644
--- 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 b453ed9e03..95fd984f07 100644
--- 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 6047115d84..43098c7e47 100644
--- 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>