From 298f3384cf1a8717fc16cccb6707d2f2e98f2926 Mon Sep 17 00:00:00 2001
From: Chandrika <chandrika@confluxtechnologies.com>
Date: Mon, 18 May 2015 16:26:34 -0400
Subject: [PATCH] MIFOSX-2037 Payment type is getting displayed in Individual
 collection sheet.

---
 .../data/IndividualCollectionSheetData.java               | 8 ++++----
 .../service/CollectionSheetReadPlatformServiceImpl.java   | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/collectionsheet/data/IndividualCollectionSheetData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/collectionsheet/data/IndividualCollectionSheetData.java
index 272232e9e..1bd0dad1f 100755
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/collectionsheet/data/IndividualCollectionSheetData.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/collectionsheet/data/IndividualCollectionSheetData.java
@@ -8,7 +8,7 @@ package org.mifosplatform.portfolio.collectionsheet.data;
 import java.util.Collection;
 
 import org.joda.time.LocalDate;
-import org.mifosplatform.infrastructure.codes.data.CodeValueData;
+import org.mifosplatform.portfolio.paymenttype.data.PaymentTypeData;
 
 /**
  * Immutable data object for collection sheet.
@@ -21,15 +21,15 @@ public class IndividualCollectionSheetData {
     private final Collection<IndividualClientData> clients;
 
     @SuppressWarnings("unused")
-    private final Collection<CodeValueData> paymentTypeOptions;
+    private final Collection<PaymentTypeData> paymentTypeOptions;
 
     public static IndividualCollectionSheetData instance(final LocalDate date, final Collection<IndividualClientData> clients,
-            final Collection<CodeValueData> paymentTypeOptions) {
+            final Collection<PaymentTypeData> paymentTypeOptions) {
         return new IndividualCollectionSheetData(date, clients, paymentTypeOptions);
     }
 
     private IndividualCollectionSheetData(final LocalDate dueDate, final Collection<IndividualClientData> clients,
-            final Collection<CodeValueData> paymentTypeOptions) {
+            final Collection<PaymentTypeData> paymentTypeOptions) {
         this.dueDate = dueDate;
         this.clients = clients;
         this.paymentTypeOptions = paymentTypeOptions;
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/collectionsheet/service/CollectionSheetReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/collectionsheet/service/CollectionSheetReadPlatformServiceImpl.java
index 9b613bb32..3c36483d3 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/collectionsheet/service/CollectionSheetReadPlatformServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/collectionsheet/service/CollectionSheetReadPlatformServiceImpl.java
@@ -673,9 +673,8 @@ public class CollectionSheetReadPlatformServiceImpl implements CollectionSheetRe
 
         // merge savings data into loan data
         mergeLoanData(collectionSheetFlatDatas, (List<IndividualClientData>) clientData);
-
-        Collection<CodeValueData> paymentOptions = this.codeValueReadPlatformService
-                .retrieveCodeValuesByCode(PaymentDetailConstants.paymentTypeCodeName);
+        
+        final Collection<PaymentTypeData> paymentOptions = this.paymentTypeReadPlatformService.retrieveAllPaymentTypes();
 
         return IndividualCollectionSheetData.instance(transactionDate, clientData, paymentOptions);