add expect payments by date pentaho rpt to core reports script + other minor changes

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java

@@ -314,7 +314,6 @@ public class ReadReportingServiceImpl implements ReadReportingService {
 
         try {
 
-            logger.info("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
             ReportParameterValues rptParamValues = report.getParameterValues();
             ReportParameterDefinition paramsDefinition = report.getParameterDefinition();
 
@@ -346,17 +345,17 @@ public class ReadReportingServiceImpl implements ReadReportingService {
                         rptParamValues.put(paramName, pValue);
                 }
 
-                // tenant database name and current user's office hierarchy
-                // passed as parameters to allow multitenant penaho reporting
-                // and
-                // data scoping
-                String tenantdb = dataSource.getConnection().getCatalog();
-                String userhierarchy = currentUser.getOffice().getHierarchy();
-                logger.info("db name:" + tenantdb + "      userhierarchy:" + userhierarchy);
-                rptParamValues.put("tenantdb", tenantdb);
-                rptParamValues.put("userhierarchy", userhierarchy);
             }
 
+            // tenant database name and current user's office hierarchy
+            // passed as parameters to allow multitenant penaho reporting
+            // and
+            // data scoping
+            String tenantdb = dataSource.getConnection().getCatalog();
+            String userhierarchy = currentUser.getOffice().getHierarchy();
+            logger.info("db name:" + tenantdb + "      userhierarchy:" + userhierarchy);
+            rptParamValues.put("tenantdb", tenantdb);
+            rptParamValues.put("userhierarchy", userhierarchy);
         } catch (Exception e) {
             logger.error("error.msg.reporting.error:" + e.getMessage());
             throw new PlatformDataIntegrityException("error.msg.reporting.error", e.getMessage());

mifosng-provider/src/main/pentahoReports/expectedPaymentsByDate.properties

@@ -0,0 +1,23 @@
+ExpectedPaymentsByDate=Expected Payments By Date
+From=From :
+To=To:
+Office=Office :
+DueDate=Due Date :
+ClientName=Client Name
+LoanAccountNo=Loan Account No:
+Product=Product
+Installment=Installment
+Date=Date
+Principal=Principal
+LoanOfficer=Loan Officer
+Interest=Interest
+FeesDue=Fees Due
+PenaltyDue=Penalty Due
+TotalDue=Total Due
+TotalOverDue=Total Over Due
+Total=Total :
+PrintedBy\:=Printed by:
+On\:=On:
+MFIName\:=MFI Name:
+Page=Page
+VersionAt=Version 1.3.1