Merge pull request #1037 from fiterlatam/SU-306

[SU-306] Transaction Report Error - PENTAHO Activation

Dockerfile

@@ -39,7 +39,12 @@ RUN wget -q https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.0.33/my
 # =========================================
 
 FROM azul/zulu-openjdk:17 as fineract
-
+#pentaho copy
+COPY --from=builder /fineract/fineract-provider/pentahoReports/*.properties /root/.mifosx/pentahoReports/
+COPY --from=builder /fineract/fineract-provider/pentahoReports/*.prpt /root/.mifosx/pentahoReports/
+#Pentaho to run on postgresDB
+COPY --from=builder /fineract/fineract-provider/pentahoReportsPostgres/*.properties /root/.mifosx/pentahoReportsPostgres/
+COPY --from=builder /fineract/fineract-provider/pentahoReportsPostgres/*.prpt /root/.mifosx/pentahoReportsPostgres/
 COPY --from=builder /fineract/fineract-provider/build/libs/ /app
 COPY --from=builder /app/libs /app/libs
 

build.gradle

@@ -129,6 +129,16 @@ gitVersioning.apply {
 
 ext['groovy.version'] = '4.0.17'
 ext['swaggerFile'] = "$rootDir/fineract-provider/build/classes/java/main/static/fineract.json".toString()
+def pentahoReportDir = System.properties['user.home'] + System.properties['file.separator'] + '.mifosx' + System.properties['file.separator'] + 'pentahoReports'
+def pentahoReportPostgrestDir = System.properties['user.home'] + System.properties['file.separator'] + '.mifosx' + System.properties['file.separator'] + 'pentahoReportsPostgres'
+copy {
+    from "fineract-provider/pentahoReports"
+    into pentahoReportDir
+}
+copy {
+    from "fineract-provider/pentahoReportsPostgres"
+    into pentahoReportPostgrestDir
+}
 
 allprojects  {
     group = 'org.apache.fineract'
@@ -153,7 +163,7 @@ allprojects  {
     spotless {
         format 'misc', {
             target '**/*.md', '**/*.properties', '**/.gitignore', '**/.openapi-generator-ignore', '**/*.yml', '**/*.xml', '**/**.json', '**/*.sql'
-            targetExclude '**/build/**', '**/bin/**', '**/.settings/**', '**/.idea/**', '**/.gradle/**', '**/gradlew.bat', '**/licenses/**', '**/banner.txt', '.vscode/**', '.profileconfig.json'
+            targetExclude '**/build/**', '**/bin/**', '**/.settings/**', '**/.idea/**', '**/.gradle/**', '**/gradlew.bat', '**/licenses/**', '**/banner.txt', '.vscode/**', '.profileconfig.json','**/**.properties'
             indentWithSpaces(4)
             endWithNewline()
             trimTrailingWhitespace()

config/docker/env/fineract.env

@@ -18,3 +18,4 @@
 #
 
 FINERACT_NODE_ID=1
+FINERACT_PENTAHO_REPORTS_PATH=/root/.mifosx/pentahoReportsPostgres

fineract-provider/build.gradle

@@ -230,6 +230,7 @@ bootRun {
     dependencies {
         implementation 'org.mariadb.jdbc:mariadb-java-client'
         implementation 'org.postgresql:postgresql'
+        implementation 'org.codehaus.groovy:groovy-jsr223:4.0.18'
     }
 }
 
@@ -256,6 +257,22 @@ jib {
             }
         }
     }
+    extraDirectories {
+        paths {
+            path {
+                from = 'ff4j'
+                into = '/.fineract/ff4j'
+            }
+            path {
+                from = 'pentahoReports'
+                into = '/root/.mifosx/pentahoReports'
+            }
+            path {
+                from = 'pentahoReportsPostgres'
+                into = '/root/.mifosx/pentahoReportsPostgres'
+            }
+        }
+    }
 
     to {
         image = 'fineract'

fineract-provider/dependencies.gradle

@@ -53,7 +53,9 @@ dependencies {
             'org.springframework.integration:spring-integration-jms',
             'org.springframework.integration:spring-integration-kafka',
             'org.springframework.kafka:spring-kafka',
-
+            fileTree('thirdparty') {
+                include '*.jar'
+            },
             'io.micrometer:micrometer-registry-prometheus',
             'io.micrometer:micrometer-registry-otlp',
             'io.micrometer:micrometer-registry-cloudwatch2',

fineract-provider/pentahoReports/Active Loans - Details.properties

@@ -0,0 +1,26 @@
+label.column.Office/Branch=Office/Branch
+label.column.Currency=Currency
+label.column.loan.Officer=Loan Officer
+label.column.client=Client
+label.column.Loan.Account.No=Loan Account No.
+label.column.Product=Product
+label.column.Fund=Fund
+label.column.Loan.Amount=Loan Amount
+label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate
+label.column.Disbursed.Date=Disbursed Date
+label.column.Expected.Matured.On=Expected Matured On
+label.column.Principal.Repaid=Principal Repaid
+label.column.Principal.Outstanding=Principal Outstanding
+label.column.Principal.Overdue=Principal Overdue
+label.column.Interest.Repaid=Interest Repaid
+label.column.Interest.Outstanding=Interest Outstanding
+label.column.Interest.Overdue=Interest Overdue
+label.column.Fees.Repaid=Fees Repaid
+label.column.Fees.Outstanding=Fees Outstanding
+label.column.Fees.Overdue=Fees Overdue
+label.column.Penalties.Repaid=Penalties Repaid
+label.column.Penalties.Outstanding=Penalties Outstanding
+label.column.Penalties.Overdue=Penalties Overdue
+label.groupby.Branch=Branch
+label.title.Active.Loans.Details=Active Loans - Details
+lable.group.tolat=Total

fineract-provider/pentahoReports/Active Loans - Summary.properties

@@ -0,0 +1,25 @@
+label.column.Office/Branch=Office/Branch
+label.column.Currency=Currency
+label.column.No.of.Clients=No. of Clients
+label.column.No.Active.Loans=No. Active Loans
+label.column.No.of.Loans.in.Arrears=No. of Loans in Arrears
+label.column.Total.Loans.Disbursed=Total Loans Disbursed
+label.column.Principal.Repaid=Principal Repaid
+label.column.Principal.Outstanding=Principal Outstanding
+label.column.Principal.Overdue=Principal Overdue
+label.column.Total.Interest=Total Interest
+label.column.Interest.Repaid=Interest Repaid
+label.column.Interest.Outstanding=Interest Outstanding
+label.column.Interest.Overdue=Interest Overdue
+label.column.Total.Fees=Total Fees
+label.column.Fees.Repaid=Fees Repaid
+label.column.Fees.Outstanding=Fees Outstanding
+label.column.Fees.Overdue=Fees Overdue
+label.column.Total.Penalties=Total Penalties
+label.column.Penalties.Repaid=Penalties Repaid
+label.column.Penalties.Outstanding=Penalties Outstanding
+label.column.Penalties.Overdue=Penalties Overdue
+label.column.Portfolio.at.Risk%=Portfolio at Risk %
+label.groupby.column.Branch=Branch
+
+label.title.Active.Loans.Details=Active Loan-Summary

fineract-provider/pentahoReports/Active Loans Passed Final Maturity Summary.properties

@@ -0,0 +1,23 @@
+label.column.Office/Branch=Office/Branch
+label.column.Currency=Currency
+label.column.No.of.Clients=No. of Clients
+label.column.No.Active.Loans=No. Active Loans
+label.column.No.of.Loans.in.Arrears=No. of Loans in Arrears
+label.column.Total.Loans.Disbursed=Total Loans Disbursed
+label.column.Principal.Repaid=Principal Repaid
+label.column.Principal.Outstanding=Principal Outstanding
+label.column.Principal.Overdue=Principal Overdue
+label.column.Total.Interest=Total Interest
+label.column.Interest.Repaid=Interest Repaid
+label.column.Interest.Outstanding=Interest Outstanding
+label.column.Interest.Overdue=Interest Overdue
+label.column.Total.Fees=Total Fees
+label.column.Fees.Repaid=Fees Repaid
+label.column.Fees.Outstanding=Fees Outstanding
+label.column.Fees.Overdue=Fees Overdue
+label.column.Total.Penalties=Total Penalties
+label.column.Penalties.Repaid=Penalties Repaid
+label.column.Penalties.Outstanding=Penalties Outstanding
+label.column.Penalties.Overdue=Penalties Overdue
+label.column.Portfolio.at.Risk%=Portfolio at Risk %
+lable.title.Active.Loans.Passed.Final.Maturity.Summary=Active Loans Passed Final Maturity Summary

fineract-provider/pentahoReports/Active Loans Passed Final Maturity.properties

@@ -0,0 +1,27 @@
+label.column.Office/Branch=Office/Branch
+label.column.Currency=Currency
+label.column.Loan.Officer=Loan Officer
+label.column.Client=Client
+label.column.Loan.Account.No=Loan Account No.
+label.column.Product=Product
+label.column.Fund=Fund
+label.column.Loan.Amount=Loan Amount
+label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate
+label.column.Disbursed.Date=Disbursed Date
+label.column.Expected.Matured.On=Expected Matured On
+label.column.Principal.Repaid=Principal Repaid
+label.column.Principal.Outstanding=Principal Outstanding
+label.column.Principal.Overdue=Principal Overdue
+label.column.Interest.Repaid=Interest Repaid
+label.column.Interest.Outstanding=Interest Outstanding
+label.column.Interest.Overdue=Interest Overdue
+label.column.Fees.Repaid=Fees Repaid
+label.column.Fees.Outstanding=Fees Outstanding
+label.column.Fees.Overdue=Fees Overdue
+label.column.Penalties.Repaid=Penalties Repaid
+label.column.Penalties.Outstanding=Penalties Outstanding
+label.column.Penalties.Overdue=Penalties Overdue
+
+lable.title.Active.Loans.Passed.Final.Maturity=Active Loans Passed Final Maturity
+
+lable.title.group.Branch=Branch

fineract-provider/pentahoReports/Active Loans by Disbursal Period.properties

@@ -0,0 +1,20 @@
+label.column.Office/Branch=Office/Branch
+label.column.Currency=Currency
+label.column.Client.Account.No=Client Account No
+label.column.Client=Client
+label.column.Loan.Account.No=Loan Account No
+label.column.Product=Product
+label.column.Fund=Fund
+label.column.Loan.Principal.Amount=Loan Principal Amount
+label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate
+label.column.Disbursed.Date=Disbursed Date
+label.column.Total.Loan(P+I+F+Pen)=Total Loan (P+I+F+Pen)
+label.column.Total.Repaid(P+I+F+Pen)=Total Repaid (P+I+F+Pen)
+label.column.Loan.Officer=Loan Officer
+label.title.Active.Loans.by.Disbursal.Period=Active Loans by Disbursal Period
+lable.grouptotal.by.date=Total
+lable.grouptotal.by.Branch= Branch Total
+label.groupby.column.Disbursed.Date=Disbursed Date
+label.groupby.column.Branch=Branch
+lable.title.Disbursal.Period.from=Disbursal  Period    from
+lable.title.Disbursal.Period.to=To

fineract-provider/pentahoReports/Active Loans in last installment Summary.properties

@@ -0,0 +1,24 @@
+label.column.Office/Branch=Office/Branch
+label.column.Currency=Currency
+label.column.No.of.Clients=No. of Clients
+label.column.No.Active.Loans=No. Active Loans
+label.column.No.of.Loans.in.Arrears=No. of Loans in Arrears
+label.column.Total.Loans.Disbursed=Total Loans Disbursed
+label.column.Principal.Repaid=Principal Repaid
+label.column.Principal.Outstanding=Principal Outstanding
+label.column.Principal.Overdue=Principal Overdue
+label.column.Total.Interest=Total Interest
+label.column.Interest.Repaid=Interest Repaid
+label.column.Interest.Outstanding=Interest Outstanding
+label.column.Interest.Overdue=Interest Overdue
+label.column.Total.Fees=Total Fees
+label.column.Fees.Repaid=Fees Repaid
+label.column.Fees.Outstanding=Fees Outstanding
+label.column.Fees.Overdue=Fees Overdue
+label.column.Total.Penalties=Total Penalties
+label.column.Penalties.Repaid=Penalties Repaid
+label.column.Penalties.Outstanding=Penalties Outstanding
+label.column.Penalties.Overdue=Penalties Overdue
+label.column.Portfolio.at.Risk%=Portfolio at Risk %
+label.groupby.column.Branch=Branch
+lable.title.Active.Loans.In.Last.Installment.Summary=Active Loans In Last Installment Summary

fineract-provider/pentahoReports/Active Loans in last installment.properties

@@ -0,0 +1,26 @@
+label.column.Office/Branch=Office/Branch
+label.column.Currency=Currency
+label.column.Loan.Officer=Loan Officer
+label.column.Client.Account.No=Client Account No
+label.column.Client=Client
+label.column.Loan.Account.No=Loan Account No
+label.column.Product=Product
+label.column.Fund=Fund
+label.column.Loan.Amount=Loan Amount
+label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate
+label.column.Disbursed=Disbursed
+label.column.Expected.Matured.On=Expected Matured On
+label.column.Principal.Repaid=Principal Repaid
+label.column.Principal.Outstanding=Principal Outstanding
+label.column.Principal.Overdue=Principal Overdue
+label.column.Interest.Repaid=Interest Repaid
+label.column.Interest.Outstanding=Interest Outstanding
+label.column.Interest.Overdue=Interest Overdue
+label.column.Fees.Repaid=Fees Repaid
+label.column.Fees.Outstanding=Fees Outstanding
+label.column.Fees.Overdue=Fees Overdue
+label.column.Penalties.Repaid=Penalties Repaid
+label.column.Penalties.Outstanding=Penalties Outstanding
+label.column.Penalties.Overdue=Penalties Overdue
+label.groupby.column.Branch=Branch
+lable.title.Active.Loans.In.Last.Installment=Active Loans In Last Installment

fineract-provider/pentahoReports/ActiveLoanSummaryperBranch.properties

@@ -0,0 +1,16 @@
+active_loan_summery.=Active Loan Summary per Branch
+branch.=Branch
+centers.=No of Centers
+groups.=No of Groups
+clients.=No of Clients
+activeloan.=No of Active Loan
+loanarrears.=No of Loan in Arrears
+disbursed.=Total Loans Disbursed
+principalrepaid.=Total Principal Repaid
+interestrepaid.=Total Interest Repaid
+principaloutstand.=Total Principal Outstanding
+interestoutstand.=Total Interest Outstanding
+amountarreas.=Amount in Arrears
+total.=Total
+PrintedBy\:=Printed By :
+On\:=On :

fineract-provider/pentahoReports/Aging Detail.properties

@@ -0,0 +1,20 @@
+label.column.Office/Branch=Office/Branch
+label.column.Currency=Currency
+label.column.Client.Account.No=Client Account No.
+label.column.Client.Name=Client Name
+label.column.Account.Number=Account Number
+label.column.Loan.Amount=Loan Amount
+label.column.Original.Principal=Original Principal
+label.column.Original.Interest=Original Interest
+label.column.Principal.Paid=Principal Paid
+label.column.Interest.Paid=Interest Paid
+label.column.Principal.Overdue=Principal Overdue
+label.column.Interest.Overdue=Interest Overdue
+label.column.Days.in.Arrears=Days in Arrears
+label.column.Weeks.In.Arrears.Band=Weeks In Arrears Band
+label.column.Days.in.Arrears.Band=Days in Arrears Band
+
+
+lable.title.Aging.Detail=Aging Detail
+
+lable.title.group.Branch=Branch

fineract-provider/pentahoReports/Aging Summary (Arrears in Months).properties

@@ -0,0 +1,12 @@
+label.column.currency=currency
+label.column.Days.In.Arrears=Days In Arrears
+label.column.No.Of.Loans=No Of Loans
+label.column.Original.Principal=Original Principal
+label.column.Original.Interest=Original Interest
+label.column.Principal.Paid=Principal Paid
+label.column.Interest.Paid=Interest Paid
+label.column.Principal.Overdue=Principal Overdue
+label.column.Interest.Overdue=Interest Overdue
+lable.title.Aging.Summary.Months=Aging Summary (Arrears in Months)
+
+lable.title.group.Branch=Branch

fineract-provider/pentahoReports/Aging Summary (Arrears in Weeks).properties

@@ -0,0 +1,13 @@
+label.column.Currency=Currency
+label.column.Weeks.In.Arrears=Weeks In Arrears(Up To)
+label.column.N.Of.Loans=No Of Loans
+label.column.Original.Principal=Original Principal
+label.column.Original.Interest=Original Interest
+label.column.Principal.Paid=Principal Paid
+label.column.Interest.Paid=Interest Paid
+label.column.Principal.Overdue=Principal Overdue
+label.column.Interest.Overdue=Interest Overdue
+
+lable.title.Aging.Summary.in.Weeks=Aging Summary (Arrears in Weeks)
+
+lable.title.group.Branch=Branch

fineract-provider/pentahoReports/Client Listing.properties

@@ -0,0 +1,10 @@
+label.column.ID=ID
+label.column.Office/Branch=Office/Branch
+label.column.Client.Account.No=Client Account No.
+label.column.Name=Name
+label.column.Status=Status
+label.column.Activation=Activation
+label.column.External.Id=External Id
+
+lable.title.Client.Listing=Client Listing
+lable.title.group.Branch=Branch

fineract-provider/pentahoReports/Client Saving Transactions.properties

@@ -0,0 +1,18 @@
+label.column.Transaction.ID=Transaction ID
+label.column.Transaction.Date=Transaction Date
+label.column.Transaction.Type=Transaction Type
+label.column.Debit=Debit
+label.column.Credit=Credit
+label.column.Balance=Balance
+label.column.Reversed=Reversed
+lable.title.Saving.Transaction=Client Saving Transaction
+lable.title.Transaction.from=From :
+lable.title.Saving.Transaction.To= To :
+lable.title.Client.Name=Client Name
+lable.title.Savings.Account.Name/No=Account Name/No
+lable.title.Branch=Branch
+lable.title.Staff=Staff
+lable.title.Interest=Interest Rate
+lable.title.Balance=Balance
+PrintedBy\:=Printed by:
+On\:=On:

fineract-provider/pentahoReports/Client Saving Transactions_fr.properties

@@ -0,0 +1,17 @@
+label.column.Transaction.ID=Transaction Id
+label.column.Transaction.Date=Date de transaction
+label.column.Transaction.Type=Type de transaction
+label.column.Debit=Débit
+label.column.Credit=Crédit
+label.column.Balance=Solde
+label.column.Reversed=Reversed
+lable.title.Transaction.from=À partir de la date :
+lable.title.Saving.Transaction.To= Jusqu’à la date :
+lable.title.Client.Name=Client Nom
+lable.title.Savings.Account.Name/No=Account Name/No
+lable.title.Branch=Branch
+lable.title.Staff=Staff
+lable.title.Interest=Interest Rate
+lable.title.Balance=Balance
+PrintedBy\:=Printed by:
+On\:=On:

fineract-provider/pentahoReports/CollectionReport.properties

@@ -0,0 +1,20 @@
+collection.=Collection Report
+receipt.=Receipt No
+group.=Group Name
+client.=Clients Name
+loanAccNo.=Loan Account No
+pricAmt.=Principal Amount
+intAmt.=Interest Amount
+totalAmt.=Total Receipt Amount
+feeAmt.=Fees
+penaltyAmt.=Penalty
+others.=Others
+mifos.=Mifos User
+actdate.=Action Date
+created.=Created Date
+office.=Branch :
+ondate.=From :
+todate.=To :
+PrintedBy\:=Printed by:
+On\:=On:
+center\:=Center :