diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java index c58e53f08..80c544159 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java +++ b/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(); diff --git a/mifosng-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt b/mifosng-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt index 8e1382257..c57cb3d17 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt and b/mifosng-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.properties b/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.properties index 2f0fad248..b981f9ecf 100644 --- a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.properties +++ b/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: diff --git a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt b/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt index f50445715..e88cd9669 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt and b/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions_fr.properties b/mifosng-provider/src/main/pentahoReports/Client Saving Transactions_fr.properties index 048d30d77..e87c59448 100644 --- a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions_fr.properties +++ b/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: