Skip to content

Commit

Permalink
Merge pull request #25 from Tedyyy-Albur/fix_ad61
Browse files Browse the repository at this point in the history
Fixs AD61, AD66 and AD67
  • Loading branch information
IOhacker authored Oct 19, 2024
2 parents 468b5f6 + 124ea5a commit f7e3d8e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ public boolean isCashBasedAccountingEnabled() {
}

public boolean isAccrualBasedAccountingEnabled() {
return isUpfrontAccrualAccounting() || isPeriodicAccrualAccounting();
return isUpfrontAccrualAccounting() && isPeriodicAccrualAccounting();
}

public boolean isUpfrontAccrualAccounting() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ private static final class SavingAccountMapperForInterestPosting implements Resu
sqlBuilder.append(
"msac.id as chargeId, msac.amount as chargeAmount, msac.charge_time_enum as chargeTimeType, msac.is_penalty as isPenaltyCharge, ");
sqlBuilder.append("txd.id as taxDetailsId, txd.amount as taxAmount, ");
sqlBuilder.append("apm1.gl_account_id as glAccountIdForInterestOnSavings, apm1.gl_account_id as glAccountIdForSavingsControl, ");
sqlBuilder.append("apm1.gl_account_id as glAccountIdForInterestOnSavings, apm.gl_account_id as glAccountIdForSavingsControl, ");
sqlBuilder.append(
"mtc.id as taxComponentId, mtc.debit_account_id as debitAccountId, mtc.credit_account_id as creditAccountId, mtc.percentage as taxPercentage ");
sqlBuilder.append("from m_savings_account sa ");
Expand All @@ -394,7 +394,7 @@ private static final class SavingAccountMapperForInterestPosting implements Resu
sqlBuilder.append("left join m_tax_group tg on tg.id = sa.tax_group_id ");
sqlBuilder.append("left join m_savings_account_transaction_tax_details txd on txd.savings_transaction_id = tr.id ");
sqlBuilder.append("left join m_tax_component mtc on mtc.id = txd.tax_component_id ");
sqlBuilder.append("left join acc_product_mapping apm on apm.product_id = sp.id and apm.financial_account_type=3 ");
sqlBuilder.append("left join acc_product_mapping apm on apm.product_id = sp.id and apm.financial_account_type=2 ");
sqlBuilder.append("left join acc_product_mapping apm1 on apm1.product_id = sp.id and apm1.financial_account_type=17 ");

this.schemaSql = sqlBuilder.toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ private void addAccrualTransactions(SavingsAccount savingsAccount, final LocalDa

List<LocalDate> postedAsOnTransactionDates = savingsAccount.getManualPostingDates();
final SavingsPostingInterestPeriodType postingPeriodType = SavingsPostingInterestPeriodType
.fromInt(savingsAccount.getInterestCompoundingPeriodType());
.fromInt(savingsAccount.getInterestPostingPeriodType());

final SavingsCompoundingInterestPeriodType compoundingPeriodType = SavingsCompoundingInterestPeriodType
.fromInt(savingsAccount.getInterestCompoundingPeriodType());
Expand Down

0 comments on commit f7e3d8e

Please sign in to comment.