Merge pull request #1396 from sughosh88/MIFOSX-1939-FIX

Modifies reports MIFOSX-1939

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

@@ -326,7 +326,7 @@ public class ReadReportingServiceImpl implements ReadReportingService {
             for (final ParameterDefinitionEntry paramDefEntry : paramsDefinition.getParameterDefinitions()) {
                 final String paramName = paramDefEntry.getName();
                 if (!((paramName.equals("tenantUrl")) || (paramName.equals("userhierarchy") || (paramName.equals("username")) || (paramName
-                        .equals("password"))))) {
+                        .equals("password") || (paramName.equals("userid")))))) {
                     logger.info("paramName:" + paramName);
                     final String pValue = queryParams.get(paramName);
                     if (StringUtils.isBlank(pValue)) { throw new PlatformDataIntegrityException("error.msg.reporting.error",
@@ -361,6 +361,10 @@ public class ReadReportingServiceImpl implements ReadReportingService {
             final String userhierarchy = currentUser.getOffice().getHierarchy();
             logger.info("db URL:" + tenantUrl + "      userhierarchy:" + userhierarchy);
             rptParamValues.put("userhierarchy", userhierarchy);
+			
+            final String userid = currentUser.getId().toString();
+            logger.info("db URL:" + tenantUrl + "      userid:" + userid);
+            rptParamValues.put("userid", userid);
 
             final MifosPlatformTenant tenant = ThreadLocalContextUtil.getTenant();
 

mifosng-provider/src/main/pentahoReports/Client Saving Transactions.properties

@@ -14,4 +14,6 @@ lable.title.Branch=Branch
 lable.title.Staff=Staff
 lable.title.Interest=Interest Rate
 lable.title.Balance=Balance
+PrintedBy\:=Printed by:
+On\:=On:
 

mifosng-provider/src/main/pentahoReports/Client Saving Transactions_fr.properties

@@ -13,4 +13,6 @@ lable.title.Branch=Branch
 lable.title.Staff=Staff
 lable.title.Interest=Interest Rate
 lable.title.Balance=Balance
+PrintedBy\:=Printed by:
+On\:=On: