From 2ae265ea3148a25de2b67389ddfbfd7c9f451763 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Tue, 1 Aug 2017 23:50:01 +0530
Subject: [PATCH 1/2] CRM-21019, Changed column labels

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

changed labels

fixed labels
---
 CRM/Financial/Form/BatchTransaction.php           | 8 ++++----
 templates/CRM/Financial/Form/BatchTransaction.tpl | 4 ++--
 templates/CRM/Financial/Page/BatchTransaction.tpl | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CRM/Financial/Form/BatchTransaction.php b/CRM/Financial/Form/BatchTransaction.php
index 457a739b527b..4742c1443a8a 100644
--- a/CRM/Financial/Form/BatchTransaction.php
+++ b/CRM/Financial/Form/BatchTransaction.php
@@ -76,10 +76,10 @@ public function preProcess() {
         '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 b453ed9e0356..95fd984f0761 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 6047115d8461..43098c7e47d9 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>

From a3933ccac3c5a2af785743c4892d250dc554016d Mon Sep 17 00:00:00 2001
From: "deb.monish" <monish.deb@jmaconsulting.biz>
Date: Sat, 5 Aug 2017 00:29:31 +0530
Subject: [PATCH 2/2] label change

---
 CRM/Financial/Form/BatchTransaction.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CRM/Financial/Form/BatchTransaction.php b/CRM/Financial/Form/BatchTransaction.php
index 4742c1443a8a..8eb3c8b43ea9 100644
--- a/CRM/Financial/Form/BatchTransaction.php
+++ b/CRM/Financial/Form/BatchTransaction.php
@@ -76,10 +76,10 @@ public function preProcess() {
         'status' => ts('Status'),
         'description' => ts('Description'),
         'payment_instrument' => ts('Payment Method'),
-        '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'),
+        'item_count' => ts('Expected Number of Items'),
+        'assigned_item_count' => ts('Actual Number of Items'),
+        'total' => ts('Expected Total Amount'),
+        'assigned_total' => ts('Actual Total Amount'),
         'opened_date' => ts('Opened'),
       );
       $this->assign('columnHeaders', $columnHeaders);