You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ad...@apache.org on 2026/05/11 15:33:11 UTC

(fineract) branch develop updated (1e69a51e8c -> ffbe42ce9c)

This is an automated email from the ASF dual-hosted git repository.

adamsaghy pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


    from 1e69a51e8c Merge pull request #5826
     add 92aa4cd469 FINERACT-1289: Taxes on Loan charges
     new ffbe42ce9c Merge pull request #5780

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 fineract-client/build.gradle                       |  17 +
 .../src/docs/en/chapters/features/index.adoc       |   1 +
 .../chapters/features/taxes-on-loan-charges.adoc   | 128 +++++
 .../module/fineract-investor/persistence.xml       |   1 +
 .../fineract-loan-origination/persistence.xml      |   1 +
 ...hargePaidByDTO.java => ChargeTaxDetailDTO.java} |  15 +-
 .../loanaccount/data/LoanChargePaidByDTO.java      |   3 +
 .../portfolio/loanaccount/domain/LoanCharge.java   |  10 +
 .../loanaccount/domain/LoanChargeTaxDetails.java   |  37 +-
 .../loanaccount/service/LoanChargeService.java     |  28 ++
 .../tenant/module/loan/module-changelog-master.xml |   1 +
 .../loan/parts/1035_add_tax_to_loan_charge.xml     |  31 +-
 .../module/fineract-loan/persistence.xml           |   1 +
 ...argeRepaymentScheduleProcessingWrapperTest.java |   3 +-
 .../service/LoanChargeServiceTaxTest.java          | 247 +++++++++
 .../fineract-progressive-loan/persistence.xml      |   1 +
 ...TaxPaymentDTO.java => ChargeTaxPaymentDTO.java} |   5 +-
 .../journalentry/data/LoanTransactionDTO.java      |   5 +
 .../service/AccountingProcessorHelper.java         |  22 +
 .../AccrualBasedAccountingProcessorForLoan.java    | 105 ++--
 .../CashBasedAccountingProcessorForLoan.java       |  72 +--
 ...EntryWritePlatformServiceJpaRepositoryImpl.java |  26 +-
 .../service/LoanCommonAccountingHelper.java        | 122 +++++
 .../starter/LoanAccountConfiguration.java          |   6 +-
 .../module/fineract-provider/persistence.xml       |   1 +
 ...AccountDelinquencyRangeEventSerializerTest.java |   3 +-
 .../tax/service/ChargeTaxApplicationService.java   |  12 +-
 .../service/ChargeTaxApplicationServiceImpl.java   |  35 +-
 .../service/ChargeTaxApplicationServiceTest.java   | 246 +++++++++
 .../fineract-working-capital-loan/persistence.xml  |   1 +
 .../LoanChargeTaxIntegrationTest.java              | 554 +++++++++++++++++++++
 31 files changed, 1589 insertions(+), 151 deletions(-)
 create mode 100644 fineract-doc/src/docs/en/chapters/features/taxes-on-loan-charges.adoc
 copy fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/{LoanChargePaidByDTO.java => ChargeTaxDetailDTO.java} (71%)
 copy fineract-provider/src/main/java/org/apache/fineract/notification/domain/NotificationMapper.java => fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanChargeTaxDetails.java (63%)
 copy fineract-provider/src/main/resources/db/changelog/tenant/parts/0022_add_batch_business_step_configuration_table.xml => fineract-loan/src/main/resources/db/changelog/tenant/module/loan/parts/1035_add_tax_to_loan_charge.xml (58%)
 create mode 100644 fineract-loan/src/test/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeServiceTaxTest.java
 copy fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/{TaxPaymentDTO.java => ChargeTaxPaymentDTO.java} (90%)
 create mode 100644 fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/LoanCommonAccountingHelper.java
 copy fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/service/PossibleNextRepaymentCalculationService.java => fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/service/ChargeTaxApplicationService.java (70%)
 copy fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/data/LoanSchedulePlanDisbursementPeriod.java => fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/service/ChargeTaxApplicationServiceImpl.java (52%)
 create mode 100644 fineract-tax/src/test/java/org/apache/fineract/portfolio/tax/service/ChargeTaxApplicationServiceTest.java
 create mode 100644 integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanChargeTaxIntegrationTest.java


(fineract) 01/01: Merge pull request #5780

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git

commit ffbe42ce9cd6352af64def28bce624abc91adfda
Merge: 1e69a51e8c 92aa4cd469
Author: Adam Saghy <ad...@gmail.com>
AuthorDate: Mon May 11 16:33:05 2026 +0100

    Merge pull request #5780
    
    FINERACT-1289: Taxes on Loan charges

 fineract-client/build.gradle                       |  17 +
 .../src/docs/en/chapters/features/index.adoc       |   1 +
 .../chapters/features/taxes-on-loan-charges.adoc   | 128 +++++
 .../module/fineract-investor/persistence.xml       |   1 +
 .../fineract-loan-origination/persistence.xml      |   1 +
 ...hargePaidByDTO.java => ChargeTaxDetailDTO.java} |  15 +-
 .../loanaccount/data/LoanChargePaidByDTO.java      |   3 +
 .../portfolio/loanaccount/domain/LoanCharge.java   |  10 +
 .../LoanChargeTaxDetails.java}                     |  37 +-
 .../loanaccount/service/LoanChargeService.java     |  28 ++
 .../tenant/module/loan/module-changelog-master.xml |   1 +
 .../loan/parts/1035_add_tax_to_loan_charge.xml     |  55 ++
 .../module/fineract-loan/persistence.xml           |   1 +
 ...argeRepaymentScheduleProcessingWrapperTest.java |   3 +-
 .../service/LoanChargeServiceTaxTest.java          | 247 +++++++++
 .../fineract-progressive-loan/persistence.xml      |   1 +
 .../journalentry/data/ChargeTaxPaymentDTO.java     |  24 +-
 .../journalentry/data/LoanTransactionDTO.java      |   5 +
 .../service/AccountingProcessorHelper.java         |  22 +
 .../AccrualBasedAccountingProcessorForLoan.java    | 105 ++--
 .../CashBasedAccountingProcessorForLoan.java       |  72 +--
 ...EntryWritePlatformServiceJpaRepositoryImpl.java |  26 +-
 .../service/LoanCommonAccountingHelper.java        | 122 +++++
 .../starter/LoanAccountConfiguration.java          |   6 +-
 .../module/fineract-provider/persistence.xml       |   1 +
 ...AccountDelinquencyRangeEventSerializerTest.java |   3 +-
 .../tax/service/ChargeTaxApplicationService.java   |  21 +-
 .../service/ChargeTaxApplicationServiceImpl.java   |  31 +-
 .../service/ChargeTaxApplicationServiceTest.java   | 246 +++++++++
 .../fineract-working-capital-loan/persistence.xml  |   1 +
 .../LoanChargeTaxIntegrationTest.java              | 554 +++++++++++++++++++++
 31 files changed, 1645 insertions(+), 143 deletions(-)

diff --cc fineract-doc/src/docs/en/chapters/features/index.adoc
index 987d483000,545a9923ff..2e3e2e79be
--- a/fineract-doc/src/docs/en/chapters/features/index.adoc
+++ b/fineract-doc/src/docs/en/chapters/features/index.adoc
@@@ -17,5 -17,5 +17,6 @@@ include::re-ageing.adoc[leveloffset=+1
  include::delayed-schedule-captures.adoc[leveloffset=+1]
  include::loan-origination-details.adoc[leveloffset=+1]
  include::working-capital-amortization-schedule.adoc[leveloffset=+1]
 +include::working-capital-discount-fee-txn.adoc[leveloffset=+1]
  include::working-capital-credit-balance-refund.adoc[leveloffset=+1]
+ include::taxes-on-loan-charges.adoc[leveloffset=+1]