feat(investment): post interest vouchers, due reminders on home and day-end close preview

Bring in the latest team changes (FD interest posting approval, recurring
deposit rules, tenant setup, cash exchange PAN, and others).
final-changelog-tenant.xml conflicted because both sides appended
includes: keep the team's includes first, then the investment
0593-0597 includes. File names differ, so the changesets do not clash.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

fineract-core/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java

@@ -95,6 +95,94 @@ public class CommandWrapperBuilder {
         return this;
     }
 
+    public CommandWrapperBuilder createInvestmentParty() {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTPARTY";
+        this.entityId = null;
+        this.href = "/investment/parties";
+        return this;
+    }
+
+    public CommandWrapperBuilder updateInvestmentParty(final Long partyId) {
+        this.actionName = "UPDATE";
+        this.entityName = "INVESTMENTPARTY";
+        this.entityId = partyId;
+        this.href = "/investment/parties/" + partyId;
+        return this;
+    }
+
+    public CommandWrapperBuilder deleteInvestmentParty(final Long partyId) {
+        this.actionName = "DELETE";
+        this.entityName = "INVESTMENTPARTY";
+        this.entityId = partyId;
+        this.href = "/investment/parties/" + partyId;
+        return this;
+    }
+
+    public CommandWrapperBuilder createInvestmentScript() {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTSCRIPT";
+        this.entityId = null;
+        this.href = "/investment/scripts";
+        return this;
+    }
+
+    public CommandWrapperBuilder updateInvestmentScript(final Long scriptId) {
+        this.actionName = "UPDATE";
+        this.entityName = "INVESTMENTSCRIPT";
+        this.entityId = scriptId;
+        this.href = "/investment/scripts/" + scriptId;
+        return this;
+    }
+
+    public CommandWrapperBuilder createInvestmentPurchase() {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTPURCHASE";
+        this.entityId = null;
+        this.href = "/investment/purchases";
+        return this;
+    }
+
+    public CommandWrapperBuilder deleteInvestmentPurchase(final Long purchaseId) {
+        this.actionName = "DELETE";
+        this.entityName = "INVESTMENTPURCHASE";
+        this.entityId = purchaseId;
+        this.href = "/investment/purchases/" + purchaseId;
+        return this;
+    }
+
+    public CommandWrapperBuilder settleInvestmentPurchase(final Long purchaseId) {
+        this.actionName = "SETTLE";
+        this.entityName = "INVESTMENTPURCHASE";
+        this.entityId = purchaseId;
+        this.href = "/investment/purchases/" + purchaseId + "/settle";
+        return this;
+    }
+
+    public CommandWrapperBuilder postInvestmentInterest(final Long purchaseId) {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTINTEREST";
+        this.entityId = purchaseId;
+        this.href = "/investment/purchases/" + purchaseId + "/interest-postings";
+        return this;
+    }
+
+    public CommandWrapperBuilder createInvestmentDailyRate() {
+        this.actionName = "CREATE";
+        this.entityName = "INVESTMENTDAILYRATE";
+        this.entityId = null;
+        this.href = "/investment/daily-rates";
+        return this;
+    }
+
+    public CommandWrapperBuilder deleteInvestmentDailyRate(final Long rateId) {
+        this.actionName = "DELETE";
+        this.entityName = "INVESTMENTDAILYRATE";
+        this.entityId = rateId;
+        this.href = "/investment/daily-rates/" + rateId;
+        return this;
+    }
+
     public CommandWrapperBuilder createChequeStockLot() {
         this.actionName = "CREATE";
         this.entityName = "CHEQUESTOCKLOT";

fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java

@@ -60,6 +60,7 @@ import org.apache.fineract.infrastructure.core.api.DateParam;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.DateFormat;
 import org.apache.fineract.infrastructure.core.data.UploadRequest;
+import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.apache.fineract.infrastructure.core.exception.UnrecognizedQueryParamException;
 import org.apache.fineract.infrastructure.core.serialization.ApiRequestJsonSerializationSettings;
 import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer;
@@ -229,6 +230,11 @@ public class JournalEntriesApiResource {
             @PathParam("transactionId") @Parameter(description = "transactionId") final String transactionId,
             @QueryParam("command") @Parameter(description = "command") final String commandParam) {
         CommandProcessingResult result;
+        if (is(commandParam, "reverse")) {
+            throw new PlatformDataIntegrityException("error.msg.journalentry.reverse.not.allowed",
+                    "Reversing a journal entry is not allowed.");
+        }
+
         if (is(commandParam, "reverse")) {
             final CommandWrapper commandRequest = new CommandWrapperBuilder().reverseJournalEntry(transactionId).withJson(jsonRequestBody)
                     .build();

fineract-provider/src/main/java/org/apache/fineract/portfolio/branchday/api/BranchDayRegisterApiResource.java

@@ -46,6 +46,7 @@ import org.apache.fineract.infrastructure.core.service.DateUtils;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
 import org.apache.fineract.portfolio.cashreport.service.VaultPositionService;
 import org.apache.fineract.portfolio.denominationmaster.service.CountedCashLedger;
+import org.apache.fineract.portfolio.investment.service.InvestmentPurchaseReadPlatformService;
 import org.apache.fineract.portfolio.savings.dailyinterest.SavingsDailyInterestOrchestrator;
 import org.apache.fineract.portfolio.savings.dailyinterest.SavingsInterestPostingReportService;
 import org.apache.fineract.portfolio.savings.fdinterest.FixedDepositInterestPostingOrchestrator;
@@ -95,8 +96,15 @@ public class BranchDayRegisterApiResource {
     private final SavingsDailyInterestOrchestrator savingsDailyInterestOrchestrator;
     private final FixedDepositInterestPostingReportService fdInterestPostingReportService;
     private final FixedDepositInterestPostingOrchestrator fdInterestPostingOrchestrator;
+    private final InvestmentPurchaseReadPlatformService investmentPurchaseReadPlatformService;
     private final Gson gson = new Gson();
 
+    private boolean isHeadOffice(final Long officeId) {
+        final Integer topLevel = jdbcTemplate.queryForObject("SELECT COUNT(*) FROM m_office WHERE id = ? AND parent_id IS NULL",
+                Integer.class, officeId);
+        return topLevel != null && topLevel > 0;
+    }
+
     // ── GET /v1/branchday ── the register itself ──────────────────────────────
 
     /**
@@ -260,6 +268,11 @@ public class BranchDayRegisterApiResource {
         final Map<String, Object> fdInterest = fdInterestPostingReportService.dayCloseInterestView(officeId, businessDate);
         result.put("fdInterestPending", fdInterest.get("pending"));
         result.put("fdInterestDue", fdInterest.get("due"));
+        // Investment interest vouchers (coupon / provision) whose date has come but which are not posted yet.
+        // A reminder only: it never stops the close (Jitendra Sir). Investments are booked at Head Office, so
+        // only the Head Office close shows it.
+        result.put("investmentInterestPending",
+                isHeadOffice(officeId) ? investmentPurchaseReadPlatformService.retrieveDueInterest(0) : List.of());
 
         return gson.toJson(result);
     }

fineract-provider/src/main/java/org/apache/fineract/portfolio/cashexchange/api/CashExchangeApiResource.java

@@ -16,6 +16,8 @@ import jakarta.ws.rs.core.MediaType;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,6 +31,7 @@ import org.apache.fineract.portfolio.denominationmaster.service.DenominationBrea
 import org.apache.fineract.portfolio.cashexchange.domain.CashExchangeDetail;
 import org.apache.fineract.portfolio.cashexchange.domain.CashExchangeDetailRepository;
 import org.apache.fineract.portfolio.cashexchange.domain.CashExchangeRepository;
+import org.apache.fineract.portfolio.client.data.ClientKycApiConstants;
 import org.apache.fineract.useradministration.domain.AppUser;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
@@ -50,6 +53,12 @@ public class CashExchangeApiResource {
     private final CashierRoleHelper cashierRoleHelper;
     private final Gson gson = new Gson();
 
+    /**
+     * Above this amount the customer's PAN must be recorded: Income Tax Rule 114B requires PAN for cash
+     * transactions of more than Rs 50,000 in a day, and RBI cash-handling guidelines follow it.
+     */
+    static final BigDecimal PAN_MANDATORY_ABOVE = new BigDecimal("50000");
+
     @POST
     @Transactional
     public String create(String body) {
@@ -78,15 +87,25 @@ public class CashExchangeApiResource {
         final String note = json.has("note") && !json.get("note").isJsonNull() ? json.get("note").getAsString() : null;
         final String customerIdProof = json.has("customerIdProof") && !json.get("customerIdProof").isJsonNull()
                 ? json.get("customerIdProof").getAsString() : null;
+        final String customerName = trimToNull(json, "customerName");
+        final String customerMobile = trimToNull(json, "customerMobile");
+        final String panInput = trimToNull(json, "panNumber");
+        final String panNumber = panInput != null ? panInput.toUpperCase(java.util.Locale.ROOT) : null;
 
         final JsonArray received = json.has("received") && json.get("received").isJsonArray() ? json.getAsJsonArray("received")
                 : new JsonArray();
         final JsonArray given = json.has("given") && json.get("given").isJsonArray() ? json.getAsJsonArray("given") : new JsonArray();
 
-        final BigDecimal receivedTotal = sumTotal(received);
-        final BigDecimal givenTotal = sumTotal(given);
+        // Each line is checked against the denomination master and carries the master's value: the amount
+        // of an exchange is never taken from a value the caller sent.
+        final Map<Long, Integer> masterValues = denominationValues();
+        final List<Leg> receivedLegs = parseLegs("received", received, masterValues);
+        final List<Leg> givenLegs = parseLegs("given", given, masterValues);
 
-        if (!hasPositiveCount(received) || !hasPositiveCount(given)) {
+        final BigDecimal receivedTotal = sumTotal(receivedLegs);
+        final BigDecimal givenTotal = sumTotal(givenLegs);
+
+        if (receivedLegs.isEmpty() || givenLegs.isEmpty()) {
             throw new PlatformDataIntegrityException("error.msg.cashexchange.empty",
                     "Both received and given denominations are required.");
         }
@@ -99,6 +118,19 @@ public class CashExchangeApiResource {
                     "Both received and given denominations are required.");
         }
 
+        // PAN is checked whenever it is given, and required above Rs 50,000. The screen enforced the
+        // threshold on its own, through a free-text "PAN / Aadhaar" box, so an API call -- or any
+        // text in that box -- recorded a large exchange with no PAN behind it.
+        if (panNumber != null && !panNumber.matches(ClientKycApiConstants.PAN_REGEX)) {
+            throw new PlatformDataIntegrityException("error.msg.cashexchange.pan.invalid",
+                    "PAN must be 5 letters, 4 digits and 1 letter (e.g. ABCDE1234F).", "panNumber", panNumber);
+        }
+        if (receivedTotal.compareTo(PAN_MANDATORY_ABOVE) > 0 && panNumber == null) {
+            throw new PlatformDataIntegrityException("error.msg.cashexchange.pan.required",
+                    "Customer PAN is required for a cash exchange above Rs 50,000 (amount " + receivedTotal + ").", "panNumber",
+                    receivedTotal);
+        }
+
         CashExchange header = new CashExchange();
         header.setAccountId(accountId);
         header.setAccountNo(accountNo);
@@ -106,7 +138,12 @@ public class CashExchangeApiResource {
         header.setExchangeAmount(receivedTotal);
         header.setExchangeDate(exchangeDate);
         header.setNote(note);
-        header.setCustomerIdProof(customerIdProof);
+        // The Excess Transaction (CTR) report reads customer_id_proof, so the verified PAN fills it when
+        // nothing else was sent.
+        header.setCustomerIdProof(customerIdProof != null && !customerIdProof.isBlank() ? customerIdProof : panNumber);
+        header.setCustomerName(customerName);
+        header.setCustomerMobile(customerMobile);
+        header.setPanNumber(panNumber);
         header.setIsReversed(false);
         header.setCreatedAt(LocalDateTime.now(DateUtils.getDateTimeZoneOfTenant()));
         try {
@@ -114,91 +151,48 @@ public class CashExchangeApiResource {
             if (user != null) {
                 header.setPerformedBy(user.getId());
                 header.setPerformedByUsername(user.getUsername());
-                // Auto-detect cashier linked to this user
-                try {
-                    Long cashierId = jdbcTemplate.queryForObject(
-                            "SELECT mc.id FROM m_cashiers mc JOIN m_staff ms ON ms.id = mc.staff_id "
-                                    + "JOIN m_appuser au ON au.staff_id = ms.id WHERE au.id = ?",
-                            Long.class, user.getId());
-                    header.setCashierId(cashierId);
-                } catch (Exception ignored) {
-            // intentionally ignored
-        }
             }
         } catch (Exception e) {
-            // resolving the current user must never block recording the exchange
+            // who made the entry is recorded when it can be read
         }
 
-        // Validate that cashier has enough of each denomination being GIVEN to the customer
-        if (header.getCashierId() != null) {
-            final java.util.Map<Long, Long> stock = denominationBreakdownWriter.getCashierNetPosition(header.getCashierId());
-            final java.util.List<String> shortages = new java.util.ArrayList<>();
-            for (JsonElement el : given) {
-                JsonObject item = el.getAsJsonObject();
-                int count = item.has("count") && !item.get("count").isJsonNull() ? item.get("count").getAsInt() : 0;
-                if (count <= 0) continue;
-                if (!item.has("denominationId") || item.get("denominationId").isJsonNull()) continue;
-                long denomId = item.get("denominationId").getAsLong();
-                long available = stock.getOrDefault(denomId, 0L);
-                if (count > available) {
-                    int denomValue = item.has("denominationValue") && !item.get("denominationValue").isJsonNull()
-                            ? item.get("denominationValue").getAsInt() : 0;
-                    shortages.add("₹" + denomValue + " (need " + count + ", available " + available + ")");
-                }
-            }
-            if (!shortages.isEmpty()) {
-                throw new PlatformDataIntegrityException(
-                        "error.msg.cashier.denomination.insufficient",
-                        "Insufficient denomination stock for exchange — cannot give: " + String.join("; ", shortages));
+        // An exchange takes notes into one cashier's drawer and hands change out of it, so only the
+        // cashier behind this login can record it, and it is always theirs. It used to go through with no
+        // cashier at all when the login was not a cashier's: the entry then belonged to no drawer, moved no
+        // cashier's position, and skipped the stock check below.
+        final Long cashierId = cashierRoleHelper.getCurrentCashierId();
+        if (cashierId == null) {
+            throw new PlatformDataIntegrityException("error.msg.cashexchange.cashier.required",
+                    "A cash exchange can only be recorded by a cashier. Your login is not linked to a cashier.");
+        }
+        header.setCashierId(cashierId);
+
+        // The cashier has to hold, denomination by denomination, what they hand to the customer. A
+        // denomination is counted across all its lines (parseLegs merges them): checked line by line, two
+        // lines of 3 against a stock of 5 each passed although 6 were being given.
+        final Map<Long, Long> stock = denominationBreakdownWriter.getCashierNetPosition(cashierId);
+        final List<String> shortages = new ArrayList<>();
+        for (final Leg leg : givenLegs) {
+            final long available = stock.getOrDefault(leg.denominationId(), 0L);
+            if (leg.count() > available) {
+                shortages.add("₹" + leg.value() + " (need " + leg.count() + ", available " + available + ")");
             }
         }
+        if (!shortages.isEmpty()) {
+            throw new PlatformDataIntegrityException("error.msg.cashier.denomination.insufficient",
+                    "Insufficient denomination stock for exchange — cannot give: " + String.join("; ", shortages));
+        }
 
         CashExchange saved = repository.saveAndFlush(header);
 
-        saveDetails(saved.getId(), "RECEIVED", received);
-        saveDetails(saved.getId(), "GIVEN", given);
+        saveDetails(saved.getId(), "RECEIVED", receivedLegs);
+        saveDetails(saved.getId(), "GIVEN", givenLegs);
 
         JsonObject result = new JsonObject();
         result.addProperty("resourceId", saved.getId());
         return gson.toJson(result);
     }
 
-    @POST
-    @Path("{id}/reverse")
-    public String reverse(@PathParam("id") Long id, String body) {
-        // Reversing moves the same cash back, so it is gated the same way REVERSE_CASHTRANSFER and
-        // REVERSE_CASHSETTLEMENT already are. See create() above and migration 0539.
-        this.context.authenticatedUser().validateHasPermissionTo("REVERSE_CASHEXCHANGE");
-
-        CashExchange exchange = repository.findById(id)
-                .orElseThrow(() -> new RuntimeException("Cash exchange not found: " + id));
-        if (Boolean.TRUE.equals(exchange.getIsReversed())) {
-            throw new PlatformDataIntegrityException("error.msg.cashexchange.already.reversed",
-                    "Cash exchange " + id + " is already reversed.");
-        }
-        String reason = null;
-        try {
-            JsonObject json = JsonParser.parseString(body).getAsJsonObject();
-            reason = json.has("reason") && !json.get("reason").isJsonNull() ? json.get("reason").getAsString() : null;
-        } catch (Exception ignored) {
-            // intentionally ignored
-        }
-        exchange.setIsReversed(true);
-        exchange.setReversedAt(LocalDateTime.now(DateUtils.getDateTimeZoneOfTenant()));
-        exchange.setReverseReason(reason);
-        try {
-            AppUser user = this.context.authenticatedUser();
-            if (user != null) exchange.setReversedBy(user.getId());
-        } catch (Exception ignored) {
-            // intentionally ignored
-        }
-        repository.save(exchange);
-        JsonObject result = new JsonObject();
-        result.addProperty("resourceId", id);
-        result.addProperty("reversed", true);
-        return gson.toJson(result);
-    }
-
     @GET
     public String getAll(
             @QueryParam("accountId") Long accountId,
@@ -238,52 +232,80 @@ public class CashExchangeApiResource {
         return gson.toJson(map);
     }
 
-    private BigDecimal sumTotal(JsonArray items) {
-        BigDecimal total = BigDecimal.ZERO;
-        for (JsonElement el : items) {
-            JsonObject item = el.getAsJsonObject();
-            int value = item.has("denominationValue") && !item.get("denominationValue").isJsonNull()
-                    ? item.get("denominationValue").getAsInt()
-                    : 0;
-            int count = item.has("count") && !item.get("count").isJsonNull() ? item.get("count").getAsInt() : 0;
-            if (count > 0) {
-                total = total.add(BigDecimal.valueOf((long) value * count));
+    /** One checked line of an exchange: a denomination from the master, the master's value for it, and how many. */
+    private record Leg(long denominationId, int value, int count) {
+    }
+
+    /** The value of every denomination in the master (a deleted one is gone; a discontinued one is still there). */
+    private Map<Long, Integer> denominationValues() {
+        final Map<Long, Integer> values = new HashMap<>();
+        for (final Map<String, Object> row : jdbcTemplate
+                .queryForList("SELECT id, denomination FROM m_denomination_master WHERE deleted = false")) {
+            values.put(((Number) row.get("id")).longValue(), ((Number) row.get("denomination")).intValue());
+        }
+        return values;
+    }
+
+    /**
+     * The lines of one side with a count, each checked against the denomination master and merged per
+     * denomination. A line must name a known denomination, and a value the caller sent for it has to be the
+     * master's: with the caller's value trusted, a request could pass a ₹10 note off as ₹500, make the two
+     * sides "equal", and shift a drawer's books by the difference. A discontinued denomination is accepted --
+     * a customer can still bring withdrawn notes to be exchanged.
+     */
+    private List<Leg> parseLegs(final String side, final JsonArray items, final Map<Long, Integer> masterValues) {
+        final Map<Long, Leg> merged = new LinkedHashMap<>();
+        for (final JsonElement el : items) {
+            final JsonObject item = el.getAsJsonObject();
+            final int count = item.has("count") && !item.get("count").isJsonNull() ? item.get("count").getAsInt() : 0;
+            if (count <= 0) {
+                continue;
             }
+            if (!item.has("denominationId") || item.get("denominationId").isJsonNull()) {
+                throw new PlatformDataIntegrityException("error.msg.cashexchange.denomination.required",
+                        "Every " + side + " line needs a denomination.");
+            }
+            final long id = item.get("denominationId").getAsLong();
+            final Integer value = masterValues.get(id);
+            if (value == null) {
+                throw new PlatformDataIntegrityException("error.msg.cashexchange.denomination.unknown",
+                        "Unknown denomination (id " + id + ") in the " + side + " notes.");
+            }
+            if (item.has("denominationValue") && !item.get("denominationValue").isJsonNull()
+                    && item.get("denominationValue").getAsInt() != value) {
+                throw new PlatformDataIntegrityException("error.msg.cashexchange.denomination.value.mismatch",
+                        "Denomination " + id + " is ₹" + value + ", not ₹" + item.get("denominationValue").getAsInt() + ".");
+            }
+            merged.merge(id, new Leg(id, value, count), (a, b) -> new Leg(id, value, a.count() + b.count()));
+        }
+        return new ArrayList<>(merged.values());
+    }
+
+    private BigDecimal sumTotal(final List<Leg> legs) {
+        BigDecimal total = BigDecimal.ZERO;
+        for (final Leg leg : legs) {
+            total = total.add(BigDecimal.valueOf((long) leg.value() * leg.count()));
         }
         return total;
     }
 
-    private boolean hasPositiveCount(JsonArray items) {
-        for (JsonElement el : items) {
-            JsonObject item = el.getAsJsonObject();
-            int count = item.has("count") && !item.get("count").isJsonNull() ? item.get("count").getAsInt() : 0;
-            if (count > 0) {
-                return true;
-            }
+    private static String trimToNull(final JsonObject json, final String key) {
+        if (!json.has(key) || json.get(key).isJsonNull()) {
+            return null;
         }
-        return false;
+        final String value = json.get(key).getAsString().trim();
+        return value.isEmpty() ? null : value;
     }
 
-    private void saveDetails(Long exchangeId, String direction, JsonArray items) {
-        for (JsonElement el : items) {
-            JsonObject item = el.getAsJsonObject();
-            int count = item.has("count") && !item.get("count").isJsonNull() ? item.get("count").getAsInt() : 0;
-            if (count <= 0) {
-                continue;
-            }
-            int value = item.has("denominationValue") && !item.get("denominationValue").isJsonNull()
-                    ? item.get("denominationValue").getAsInt()
-                    : 0;
-            Long denominationId = item.has("denominationId") && !item.get("denominationId").isJsonNull()
-                    ? item.get("denominationId").getAsLong()
-                    : null;
-            CashExchangeDetail detail = new CashExchangeDetail();
+    private void saveDetails(final Long exchangeId, final String direction, final List<Leg> legs) {
+        for (final Leg leg : legs) {
+            final CashExchangeDetail detail = new CashExchangeDetail();
             detail.setExchangeId(exchangeId);
             detail.setDirection(direction);
-            detail.setDenominationId(denominationId);
-            detail.setDenominationValue(value);
-            detail.setCount(count);
-            detail.setTotalAmount(BigDecimal.valueOf((long) value * count));
+            detail.setDenominationId(leg.denominationId());
+            detail.setDenominationValue(leg.value());
+            detail.setCount(leg.count());
+            detail.setTotalAmount(BigDecimal.valueOf((long) leg.value() * leg.count()));
             detailRepository.save(detail);
         }
     }
@@ -296,6 +318,9 @@ public class CashExchangeApiResource {
         map.put("accountNo", e.getAccountNo());
         map.put("clientId", e.getClientId());
         map.put("customerIdProof", e.getCustomerIdProof());
+        map.put("customerName", e.getCustomerName());
+        map.put("customerMobile", e.getCustomerMobile());
+        map.put("panNumber", e.getPanNumber());
         map.put("exchangeAmount", e.getExchangeAmount());
         map.put("exchangeDate", e.getExchangeDate() != null ? e.getExchangeDate().toString() : null);
         map.put("note", e.getNote());

fineract-provider/src/main/java/org/apache/fineract/portfolio/cashexchange/domain/CashExchange.java

@@ -52,6 +52,17 @@ public class CashExchange {
     @Column(name = "customer_id_proof", length = 50)
     private String customerIdProof;
 
+    /** Walk-in customer's name; for an existing client, their display name at the time of the exchange. */
+    @Column(name = "customer_name", length = 150)
+    private String customerName;
+
+    @Column(name = "customer_mobile", length = 20)
+    private String customerMobile;
+
+    /** PAN verified at the counter; mandatory when the exchange is above Rs 50,000. */
+    @Column(name = "pan_number", length = 10)
+    private String panNumber;
+
     @Column(name = "performed_by")
     private Long performedBy;
 

fineract-provider/src/main/java/org/apache/fineract/portfolio/cashintercashier/api/CashInterCashierApiResource.java

@@ -74,6 +74,15 @@ public class CashInterCashierApiResource {
             throw new PlatformDataIntegrityException("error.msg.cashintercashier.same.cashier",
                     "From-cashier and To-cashier cannot be the same.");
         }
+        // The cash leaves the sender's drawer, so only the sender can hand it over: the logged-in cashier
+        // is always the from-cashier. Nobody -- a manager, another cashier -- records a transfer out of
+        // somebody else's drawer.
+        final Long ownCashierId = cashierRoleHelper.getCurrentCashierId();
+        if (ownCashierId == null || !ownCashierId.equals(fromCashierId)) {
+            throw new PlatformDataIntegrityException("error.msg.cashintercashier.from.must.be.own",
+                    "An inter-cashier transfer can only be made by the cashier handing the cash over, from their own"
+                            + " drawer.");
+        }
 
         final LocalDate transferDate = json.has("transferDate") && !json.get("transferDate").isJsonNull()
                 ? LocalDate.parse(json.get("transferDate").getAsString()) : LocalDate.now(DateUtils.getDateTimeZoneOfTenant());
@@ -92,6 +101,13 @@ public class CashInterCashierApiResource {
                     "At least one denomination with a positive count is required.");
         }
 
+        // Neither side can take part before the vault has allocated them cash for the day: a cashier
+        // who never opened their till has no morning allocation behind their drawer, so they can
+        // neither hand cash on nor take it in. Checked first so that is the message they see, not a
+        // shortfall on some denomination.
+        validateCashAllocated(fromCashierId, transferDate, "from");
+        validateCashAllocated(toCashierId, transferDate, "to");
+
         // The sending cashier has to actually hold these notes. Cash transfer validates the vault's
         // stock and settlement validates the cashier's; this register validated neither, so a cashier
         // holding five ₹500 notes could hand 200 of them to a colleague. Both sides are then wrong
@@ -134,45 +150,6 @@ public class CashInterCashierApiResource {
         return gson.toJson(result);
     }
 
-    @POST
-    @Path("{id}/reverse")
-    @Transactional
-    public String reverse(@PathParam("id") Long id, String body) {
-        context.authenticatedUser().validateHasPermissionTo("REVERSE_CASHINTERCASHIER");
-
-        CashInterCashier record = repository.findById(id)
-                .orElseThrow(() -> new PlatformDataIntegrityException("error.msg.cashintercashier.not.found",
-                        "Inter-cashier transfer not found: " + id));
-        if (Boolean.TRUE.equals(record.getIsReversed())) {
-            throw new PlatformDataIntegrityException("error.msg.cashintercashier.already.reversed",
-                    "Inter-cashier transfer " + id + " is already reversed.");
-        }
-
-        String reason = null;
-        try {
-            JsonObject json = JsonParser.parseString(body).getAsJsonObject();
-            reason = json.has("reason") ? json.get("reason").getAsString() : null;
-        } catch (Exception ignored) {
-            // intentionally ignored
-        }
-
-        AppUser user = null;
-        try { user = this.context.authenticatedUser(); } catch (Exception ignored) {
-            // intentionally ignored
-        }
-
-        record.setIsReversed(true);
-        record.setReversedAt(LocalDateTime.now(DateUtils.getDateTimeZoneOfTenant()));
-        record.setReverseReason(reason);
-        if (user != null) record.setReversedBy(user.getId());
-        repository.save(record);
-
-        JsonObject result = new JsonObject();
-        result.addProperty("resourceId", id);
-        result.addProperty("reversed", true);
-        return gson.toJson(result);
-    }
-
     @GET
     public String getAll(
             @QueryParam("offset") @jakarta.ws.rs.DefaultValue("0")  int offset,
@@ -209,6 +186,77 @@ public class CashInterCashierApiResource {
         return gson.toJson(map);
     }
 
+    /**
+     * One cashier's details, today's vault allocation and denomination-wise cash, so the inter-cashier
+     * screen can show both sides before the transfer is recorded. The Cashier Position endpoint cannot
+     * serve this: for a plain cashier it ignores {@code cashierId} and returns their own position, so
+     * the receiving cashier's figures would never show.
+     */
+    @GET
+    @Path("cashier-summary")
+    public String cashierSummary(@QueryParam("cashierId") final Long cashierId, @QueryParam("date") final String date) {
+        context.authenticatedUser().validateHasReadPermission("CASHINTERCASHIER");
+        if (cashierId == null) {
+            throw new PlatformDataIntegrityException("error.msg.cashintercashier.cashier.required", "cashierId is required.");
+        }
+        final LocalDate asOf = date != null && !date.isBlank() ? LocalDate.parse(date) : DateUtils.getBusinessLocalDate();
+
+        final List<Map<String, Object>> rows = jdbcTemplate.queryForList("""
+                SELECT c.id AS cashier_id, s.display_name AS staff_name, c.teller_id, t.name AS teller_name,
+                       t.office_id, o.name AS office_name
+                  FROM m_cashiers c
+                  LEFT JOIN m_staff s ON s.id = c.staff_id
+                  LEFT JOIN m_tellers t ON t.id = c.teller_id
+                  LEFT JOIN m_office o ON o.id = t.office_id
+                 WHERE c.id = ?
+                """, cashierId);
+        if (rows.isEmpty()) {
+            throw new PlatformDataIntegrityException("error.msg.cashintercashier.cashier.not.found",
+                    "Cashier not found: " + cashierId);
+        }
+        final Map<String, Object> row = rows.get(0);
+        final BigDecimal allocated = allocatedAmount(cashierId, asOf);
+        final Map<String, Object> position = cashReportApiResource.buildPositionForCashier(cashierId, asOf.toString());
+
+        final Map<String, Object> resp = new LinkedHashMap<>();
+        resp.put("cashierId", cashierId);
+        resp.put("cashierName", row.get("staff_name"));
+        resp.put("tellerId", row.get("teller_id"));
+        resp.put("tellerName", row.get("teller_name"));
+        resp.put("officeId", row.get("office_id"));
+        resp.put("officeName", row.get("office_name"));
+        resp.put("asOfDate", asOf.toString());
+        resp.put("cashAllocated", allocated.signum() > 0);
+        resp.put("allocatedAmount", allocated);
+        resp.put("totalAmount", position.get("totalAmount"));
+        resp.put("denominations", position.get("denominations"));
+        return gson.toJson(resp);
+    }
+
+    /**
+     * Cash the vault allocated to the cashier on the date, from the same non-reversed
+     * {@code m_cash_transfer} rows the "No Cash Allocated" gate on the transaction screens counts.
+     */
+    private BigDecimal allocatedAmount(final Long cashierId, final LocalDate date) {
+        final BigDecimal amount = jdbcTemplate.queryForObject("""
+                SELECT COALESCE(SUM(ct.transfer_amount), 0) FROM m_cash_transfer ct
+                 WHERE ct.to_cashier_id = ? AND ct.transfer_date = CAST(? AS DATE)
+                   AND (ct.is_reversed IS NULL OR ct.is_reversed = false)
+                """, BigDecimal.class, cashierId, date.toString());
+        return amount != null ? amount : BigDecimal.ZERO;
+    }
+
+    private void validateCashAllocated(final Long cashierId, final LocalDate date, final String side) {
+        if (allocatedAmount(cashierId, date).signum() > 0) {
+            return;
+        }
+        final String role = "from".equals(side) ? "sending" : "receiving";
+        throw new PlatformDataIntegrityException("error.msg.cashintercashier." + side + ".cashier.cash.not.allocated",
+                "The " + role + " cashier has not been allocated cash from the vault for " + date
+                        + ". Allocate cash to them through Cash Transfer before an inter-cashier transfer.",
+                side + "CashierId", cashierId);
+    }
+
     private BigDecimal sumTotal(JsonArray items) {
         BigDecimal total = BigDecimal.ZERO;
         for (JsonElement el : items) {
@@ -231,8 +279,8 @@ public class CashInterCashierApiResource {
      * Same check, same source of truth and same message shape as
      * {@code CashSettlementApiResource.validateCashierHoldsDenominations} -- the Cashier Position
      * figure, so a cashier cannot hand over notes that report says they are not holding. An empty
-     * position is left alone rather than refused, matching the settlement path: a cashier with no
-     * recorded position yet is a setup state, not an overdraft.
+     * position means the cashier holds nothing: create() only gets here for a cashier the vault has
+     * allocated cash to, so an empty position is cash already handed on, not a setup state.
      */
     private void validateCashierHoldsDenominations(final Long fromCashierId, final JsonArray denominations,
             final LocalDate transferDate) {
@@ -242,12 +290,9 @@ public class CashInterCashierApiResource {
 
         @SuppressWarnings("unchecked")
         final List<Map<String, Object>> heldRows = (List<Map<String, Object>>) position.get("denominations");
-        if (heldRows == null || heldRows.isEmpty()) {
-            return;
-        }
 
         final Map<Long, Long> held = new java.util.HashMap<>();
-        for (final Map<String, Object> row : heldRows) {
+        for (final Map<String, Object> row : heldRows == null ? List.<Map<String, Object>>of() : heldRows) {
             final Object id = row.get("denominationId");
             final Object count = row.get("count");
             if (id instanceof Number && count instanceof Number) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/cashreconciliation/api/CashReconciliationApiResource.java

@@ -28,6 +28,7 @@ import org.apache.fineract.portfolio.cashreconciliation.domain.CashReconciliatio
 import org.apache.fineract.portfolio.cashreconciliation.domain.CashReconciliationDetail;
 import org.apache.fineract.portfolio.cashreconciliation.domain.CashReconciliationDetailRepository;
 import org.apache.fineract.portfolio.cashreconciliation.domain.CashReconciliationRepository;
+import org.apache.fineract.portfolio.cashreport.service.CashierRoleHelper;
 import org.apache.fineract.portfolio.denominationmaster.service.CountedCashLedger;
 import org.apache.fineract.useradministration.domain.AppUser;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -46,8 +47,26 @@ public class CashReconciliationApiResource {
     private final CashReconciliationDetailRepository detailRepository;
     private final PlatformSecurityContext context;
     private final JdbcTemplate jdbcTemplate;
+    private final CashierRoleHelper cashierRoleHelper;
     private final Gson gson = new Gson();
 
+    /**
+     * A cashier reconciles only their own drawer. The cashier is picked on the screen, and two cashiers
+     * under one teller could name each other: one cashier's count then stands in for another's, and the
+     * reconciliation record is what a settlement is later allowed on the strength of. A user who is not
+     * a cashier-only login (a manager, the branch head) is not limited.
+     */
+    private void requireOwnCashier(final Long cashierId) {
+        if (!cashierRoleHelper.isCashierOnly()) {
+            return;
+        }
+        final Long own = cashierRoleHelper.getCurrentCashierId();
+        if (own == null || !own.equals(cashierId)) {
+            throw new PlatformDataIntegrityException("error.msg.cashreconciliation.other.cashier",
+                    "A cashier can only reconcile their own cash.");
+        }
+    }
+
     /**
      * GET /cashreconciliation/expected?cashierId=X&asOfDate=yyyy-MM-dd
      * Returns denomination-wise expected balance for a cashier.
@@ -64,6 +83,7 @@ public class CashReconciliationApiResource {
             throw new PlatformDataIntegrityException("error.msg.cashreconciliation.cashier.required",
                     "cashierId query param is required.");
         }
+        requireOwnCashier(cashierId);
         final String dateFilter = (asOfDate != null && !asOfDate.isBlank()) ? asOfDate : LocalDate.now(DateUtils.getDateTimeZoneOfTenant()).toString();
 
         // In: vault → cashier allocations — GROUP BY denomination_id+kind to keep coin and note separate
@@ -227,6 +247,7 @@ public class CashReconciliationApiResource {
             throw new PlatformDataIntegrityException("error.msg.cashreconciliation.cashier.required",
                     "cashierId query param is required.");
         }
+        requireOwnCashier(cashierId);
         final String reconDate = (date != null && !date.isBlank()) ? date : LocalDate.now(DateUtils.getDateTimeZoneOfTenant()).toString();
         Integer count = jdbcTemplate.queryForObject(
                 "SELECT COUNT(*) FROM m_cash_reconciliation WHERE cashier_id = ? AND recon_date = CAST(? AS DATE)",
@@ -250,6 +271,14 @@ public class CashReconciliationApiResource {
             throw new PlatformDataIntegrityException("error.msg.cashreconciliation.cashier.required",
                     "cashierId is required.");
         }
+        // A reconciliation is the cashier's own count of their own drawer. Unlike reading one (a manager
+        // looks at a cashier's, and day close checks each), recording one is the cashier's alone: neither
+        // another cashier nor a manager can count a drawer on its owner's behalf.
+        final Long ownCashierId = cashierRoleHelper.getCurrentCashierId();
+        if (ownCashierId == null || !ownCashierId.equals(cashierId)) {
+            throw new PlatformDataIntegrityException("error.msg.cashreconciliation.own.cashier.only",
+                    "A reconciliation can only be recorded by the cashier whose drawer it is.");
+        }
         final LocalDate reconDate = json.has("reconDate") && !json.get("reconDate").isJsonNull()
                 ? LocalDate.parse(json.get("reconDate").getAsString()) : LocalDate.now(DateUtils.getDateTimeZoneOfTenant());
         final String cashierName = json.has("cashierName") && !json.get("cashierName").isJsonNull()
@@ -338,7 +367,11 @@ public class CashReconciliationApiResource {
 
     @GET
     public String getAll() {
+        // A cashier sees their own reconciliations only; everyone else sees all of them.
+        final boolean cashierOnly = cashierRoleHelper.isCashierOnly();
+        final Long ownCashierId = cashierOnly ? cashierRoleHelper.getCurrentCashierId() : null;
         return gson.toJson(repository.findAllByOrderByCreatedAtDesc().stream()
+                .filter(e -> !cashierOnly || (ownCashierId != null && ownCashierId.equals(e.getCashierId())))
                 .map(this::toMap).collect(Collectors.toList()));
     }
 
@@ -347,6 +380,7 @@ public class CashReconciliationApiResource {
     public String getOne(@PathParam("id") Long id) {
         CashReconciliation header = repository.findById(id)
                 .orElseThrow(() -> new RuntimeException("Cash reconciliation not found: " + id));
+        requireOwnCashier(header.getCashierId());
         Map<String, Object> map = toMap(header);
         map.put("details", detailRepository.findByReconciliationId(id).stream()
                 .map(this::detailToMap).collect(Collectors.toList()));

fineract-provider/src/main/java/org/apache/fineract/portfolio/cashreport/api/CashReportApiResource.java

@@ -14,6 +14,7 @@ import java.util.List;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
 import org.apache.fineract.portfolio.cashreport.service.CashierRoleHelper;
 import org.apache.fineract.portfolio.cashreport.service.VaultPositionService;
@@ -1083,6 +1084,137 @@ public class CashReportApiResource {
         return gson.toJson(vaultPositionService.buildPositionForVault(tellerId, dateFilter));
     }
 
+    /**
+     * GET /cashreports/branch-position?officeId=X&asOfDate=yyyy-MM-dd
+     *
+     * The notes and coins a branch holds, denomination by denomination: its vault(s) plus every cashier's
+     * drawer. Cash moving between the vault and a drawer, or from one drawer to another, nets out in this
+     * total; what changes it is what crosses the counter -- a deposit, a withdrawal, an exchange. An exchange
+     * (a customer hands in 10 x ₹500 and leaves with 50 x ₹100) is +10 on ₹500 and -50 on ₹100 here, and the
+     * "exchangeNet" column carries that day's exchange movement beside the total so it can be seen.
+     *
+     * Until now no screen showed this total: the vault is untouched by an exchange and each drawer is shown
+     * alone, so what the branch held per denomination was only known from the hand-entered count at day
+     * open and close. Not for a cashier -- it spans every drawer; they see their own on Cashier Position.
+     */
+    @GET
+    @Path("branch-position")
+    public String branchPosition(@QueryParam("officeId") final Long officeIdParam, @QueryParam("asOfDate") final String asOfDate) {
+        if (cashierRoleHelper.isCashierOnly()) {
+            throw new PlatformDataIntegrityException("error.msg.cashreport.branchposition.not.for.cashier",
+                    "The branch cash position covers every drawer; a cashier sees their own on the Cashier Position screen.");
+        }
+        final String dateFilter = (asOfDate != null && !asOfDate.isBlank()) ? asOfDate
+                : DateUtils.getBusinessLocalDate().toString();
+        final Long officeId = officeIdParam != null ? officeIdParam : context.authenticatedUser().getOffice().getId();
+        final List<String> officeNames = jdbcTemplate.queryForList("SELECT name FROM m_office WHERE id = ?", String.class, officeId);
+        if (officeNames.isEmpty()) {
+            throw new PlatformDataIntegrityException("error.msg.cashreport.branchposition.office.not.found",
+                    "Office not found: " + officeId);
+        }
+
+        // One row per denomination in the master; a discontinued one (the ₹2000 note) shows only while
+        // something is still held or moved in it.
+        final Map<Long, Map<String, Object>> rows = new LinkedHashMap<>();
+        for (final Map<String, Object> m : jdbcTemplate
+                .queryForList("SELECT id, denomination, kind, is_active FROM m_denomination_master WHERE deleted = false")) {
+            final long id = ((Number) m.get("id")).longValue();
+            final Map<String, Object> row = new LinkedHashMap<>();
+            row.put("denominationId", id);
+            row.put("denominationValue", ((Number) m.get("denomination")).intValue());
+            row.put("kind", m.get("kind"));
+            row.put("active", Boolean.TRUE.equals(m.get("is_active")));
+            row.put("vaultCount", 0L);
+            row.put("cashierCount", 0L);
+            row.put("exchangeNet", 0L);
+            rows.put(id, row);
+        }
+
+        boolean vaultHasBreakdown = false;
+        for (final Long tellerId : jdbcTemplate.queryForList("SELECT id FROM m_tellers WHERE office_id = ? ORDER BY id", Long.class,
+                officeId)) {
+            final Map<String, Object> vault = vaultPositionService.buildPositionForVault(tellerId, dateFilter);
+            vaultHasBreakdown = vaultHasBreakdown || Boolean.TRUE.equals(vault.get("hasBreakdown"));
+            addPositionCounts(rows, vault, "vaultCount");
+        }
+        for (final Long cashierId : jdbcTemplate.queryForList(
+                "SELECT mc.id FROM m_cashiers mc JOIN m_tellers t ON t.id = mc.teller_id WHERE t.office_id = ? ORDER BY mc.id",
+                Long.class, officeId)) {
+            addPositionCounts(rows, buildPositionForCashier(cashierId, dateFilter), "cashierCount");
+        }
+
+        // The day's exchanges across the branch's cashiers: notes taken in less notes given out, per denomination.
+        for (final Map<String, Object> r : jdbcTemplate.queryForList("""
+                SELECT ced.denomination_id,
+                       SUM(CASE WHEN ced.direction = 'RECEIVED' THEN ced.count ELSE -ced.count END) AS net
+                  FROM m_cash_exchange_detail ced
+                  JOIN m_cash_exchange ce ON ce.id = ced.exchange_id
+                  JOIN m_cashiers mc ON mc.id = ce.cashier_id
+                  JOIN m_tellers t ON t.id = mc.teller_id
+                 WHERE t.office_id = ? AND ce.exchange_date = CAST(? AS DATE)
+                   AND (ce.is_reversed IS NULL OR ce.is_reversed = false)
+                 GROUP BY ced.denomination_id
+                """, officeId, dateFilter)) {
+            final Object id = r.get("denomination_id");
+            final Object net = r.get("net");
+            if (id instanceof Number && net instanceof Number && rows.containsKey(((Number) id).longValue())) {
+                rows.get(((Number) id).longValue()).put("exchangeNet", ((Number) net).longValue());
+            }
+        }
+
+        final List<Map<String, Object>> lines = new ArrayList<>();
+        BigDecimal vaultAmount = BigDecimal.ZERO;
+        BigDecimal cashiersAmount = BigDecimal.ZERO;
+        for (final Map<String, Object> row : rows.values()) {
+            final long vaultCount = ((Number) row.get("vaultCount")).longValue();
+            final long cashierCount = ((Number) row.get("cashierCount")).longValue();
+            final long exchangeNet = ((Number) row.get("exchangeNet")).longValue();
+            final int value = ((Number) row.get("denominationValue")).intValue();
+            if (!Boolean.TRUE.equals(row.get("active")) && vaultCount == 0 && cashierCount == 0 && exchangeNet == 0) {
+                continue;
+            }
+            row.put("totalCount", vaultCount + cashierCount);
+            row.put("totalAmount", BigDecimal.valueOf(value * (vaultCount + cashierCount)));
+            vaultAmount = vaultAmount.add(BigDecimal.valueOf(value * vaultCount));
+            cashiersAmount = cashiersAmount.add(BigDecimal.valueOf(value * cashierCount));
+            lines.add(row);
+        }
+        lines.sort((a, b) -> Integer.compare(((Number) b.get("denominationValue")).intValue(),
+                ((Number) a.get("denominationValue")).intValue()));
+
+        final Map<String, Object> resp = new LinkedHashMap<>();
+        resp.put("officeId", officeId);
+        resp.put("officeName", officeNames.get(0));
+        resp.put("asOfDate", dateFilter);
+        resp.put("vaultHasBreakdown", vaultHasBreakdown);
+        resp.put("vaultAmount", vaultAmount);
+        resp.put("cashiersAmount", cashiersAmount);
+        resp.put("totalAmount", vaultAmount.add(cashiersAmount));
+        resp.put("denominations", lines);
+        return gson.toJson(resp);
+    }
+
+    /** Adds a position's per-denomination counts (a vault's or a cashier's) into one field of the rows. */
+    @SuppressWarnings("unchecked")
+    private void addPositionCounts(final Map<Long, Map<String, Object>> rows, final Map<String, Object> position,
+            final String field) {
+        final List<Map<String, Object>> lines = (List<Map<String, Object>>) position.get("denominations");
+        if (lines == null) {
+            return;
+        }
+        for (final Map<String, Object> line : lines) {
+            final Object id = line.get("denominationId");
+            final Object count = line.get("count");
+            if (!(id instanceof Number) || !(count instanceof Number)) {
+                continue;
+            }
+            final Map<String, Object> row = rows.get(((Number) id).longValue());
+            if (row != null) {
+                row.merge(field, ((Number) count).longValue(), (a, b) -> ((Number) a).longValue() + ((Number) b).longValue());
+            }
+        }
+    }
+
     /**
      * GET /cashreports/cashier-morning?cashierId=X&date=YYYY-MM-DD
      * Returns denomination-wise cash received by the cashier from vault on the given date

fineract-provider/src/main/java/org/apache/fineract/portfolio/cashsettlement/api/CashSettlementApiResource.java

@@ -33,7 +33,6 @@ import org.apache.fineract.portfolio.cashsettlement.domain.CashSettlementDetail;
 import org.apache.fineract.portfolio.cashsettlement.domain.CashSettlementDetailRepository;
 import org.apache.fineract.portfolio.cashsettlement.domain.CashSettlementRepository;
 import org.apache.fineract.portfolio.teller.service.GlDispatchService;
-import org.apache.fineract.portfolio.voucher.service.VoucherLine;
 import org.apache.fineract.portfolio.voucher.service.VoucherService;
 import org.apache.fineract.useradministration.domain.AppUser;
 import org.springframework.stereotype.Component;
@@ -181,64 +180,6 @@ public class CashSettlementApiResource {
         return gson.toJson(result);
     }
 
-    @POST
-    @Path("{id}/reverse")
-    @Transactional
-    public String reverse(@PathParam("id") Long id, String body) {
-        context.authenticatedUser().validateHasPermissionTo("REVERSE_CASHSETTLEMENT");
-
-        CashSettlement settlement = repository.findById(id)
-                .orElseThrow(() -> new PlatformDataIntegrityException("error.msg.cashsettlement.not.found",
-                        "Settlement not found: " + id));
-        if (Boolean.TRUE.equals(settlement.getIsReversed())) {
-            throw new PlatformDataIntegrityException("error.msg.cashsettlement.already.reversed",
-                    "Settlement " + id + " is already reversed.");
-        }
-
-        String reason = null;
-        try {
-            JsonObject json = JsonParser.parseString(body).getAsJsonObject();
-            reason = json.has("reason") ? json.get("reason").getAsString() : null;
-        } catch (Exception ignored) {
-            // intentionally ignored
-        }
-
-        AppUser user = null;
-        try { user = this.context.authenticatedUser(); } catch (Exception ignored) {
-            // intentionally ignored
-        }
-
-        settlement.setIsReversed(true);
-        settlement.setReversedAt(LocalDateTime.now(DateUtils.getDateTimeZoneOfTenant()));
-        settlement.setReverseReason(reason);
-        if (user != null) settlement.setReversedBy(user.getId());
-        repository.save(settlement);
-
-        if (settlement.getToTellerId() != null && settlement.getFromCashierId() != null) {
-            try {
-                Long glTellerId = settlement.getToTellerId();
-                try {
-                    Long resolved = jdbcTemplate.queryForObject(
-                            "SELECT teller_id FROM m_cashiers WHERE id = ?", Long.class, settlement.getFromCashierId());
-                    if (resolved != null) glTellerId = resolved;
-                } catch (Exception ignored) {
-            // intentionally ignored
-        }
-                glDispatchService.allocateCashToCashier(glTellerId,
-                        settlement.getFromCashierId(), settlement.getSettlementAmount(), "INR",
-                        DateUtils.getBusinessLocalDate().format(DateTimeFormatter.ISO_LOCAL_DATE),
-                        "Reversal of cash settlement #" + id + (reason != null ? ": " + reason : ""));
-            } catch (Exception ignored) {
-            // intentionally ignored
-        }
-        }
-
-        JsonObject result = new JsonObject();
-        result.addProperty("resourceId", id);
-        result.addProperty("reversed", true);
-        return gson.toJson(result);
-    }
-
     @GET
     @Path("check")
     public String check(@QueryParam("cashierId") Long cashierId, @QueryParam("date") String date) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/cashtransfer/api/CashTransferApiResource.java

@@ -35,7 +35,6 @@ import org.apache.fineract.useradministration.domain.AppUser;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionTemplate;
 import org.apache.fineract.infrastructure.core.service.DateUtils;
 
@@ -160,65 +159,6 @@ public class CashTransferApiResource {
         return gson.toJson(result);
     }
 
-    @POST
-    @Path("{id}/reverse")
-    @Transactional
-    public String reverse(@PathParam("id") Long id, String body) {
-        this.context.authenticatedUser().validateHasPermissionTo("REVERSE_CASHTRANSFER");
-
-        CashTransfer transfer = repository.findById(id)
-                .orElseThrow(() -> new PlatformDataIntegrityException("error.msg.cashtransfer.not.found",
-                        "Cash transfer not found: " + id));
-        if (Boolean.TRUE.equals(transfer.getIsReversed())) {
-            throw new PlatformDataIntegrityException("error.msg.cashtransfer.already.reversed",
-                    "Cash transfer " + id + " is already reversed.");
-        }
-
-        String reason = null;
-        try {
-            JsonObject json = JsonParser.parseString(body).getAsJsonObject();
-            reason = json.has("reason") ? json.get("reason").getAsString() : null;
-        } catch (Exception ignored) {
-            // intentionally ignored
-        }
-
-        try {
-            AppUser user = this.context.authenticatedUser();
-            transfer.setReversedBy(user.getId());
-        } catch (Exception ignored) {
-            // intentionally ignored
-        }
-
-        transfer.setIsReversed(true);
-        transfer.setReversedAt(java.time.LocalDateTime.now(DateUtils.getDateTimeZoneOfTenant()));
-        transfer.setReverseReason(reason);
-        repository.save(transfer);
-
-        if (transfer.getFromTellerId() != null && transfer.getToCashierId() != null) {
-            try {
-                Long glTellerId = transfer.getFromTellerId();
-                try {
-                    Long resolved = jdbcTemplate.queryForObject(
-                            "SELECT teller_id FROM m_cashiers WHERE id = ?", Long.class, transfer.getToCashierId());
-                    if (resolved != null) glTellerId = resolved;
-                } catch (Exception ignored) {
-            // intentionally ignored
-        }
-                glDispatchService.settleCashFromCashier(glTellerId,
-                        transfer.getToCashierId(), transfer.getTransferAmount(), "INR",
-                        DateUtils.getBusinessLocalDate().format(DateTimeFormatter.ISO_LOCAL_DATE),
-                        "Reversal of cash transfer #" + id + (reason != null ? ": " + reason : ""));
-            } catch (Exception ignored) {
-            // intentionally ignored
-        }
-        }
-
-        JsonObject result = new JsonObject();
-        result.addProperty("resourceId", id);
-        result.addProperty("reversed", true);
-        return gson.toJson(result);
-    }
-
     @GET
     public String getAll(
             @QueryParam("offset") @jakarta.ws.rs.DefaultValue("0")  int offset,

fineract-provider/src/main/java/org/apache/fineract/portfolio/customersearch/service/CustomerSearchReadPlatformServiceImpl.java

@@ -38,14 +38,19 @@ public class CustomerSearchReadPlatformServiceImpl implements CustomerSearchRead
 
     private static final Set<String> VALID_ACCOUNT_TYPES = Set.of("SAVINGS", "CURRENT", "FIXED_DEPOSIT", "RECURRING_DEPOSIT");
 
+    // A customer's PAN lives on their KYC record (m_client_kyc, one row per client) and, for some, as a
+    // "PAN Card" ID proof. The KYC record is what the client screens and cash screens read, so it wins;
+    // the ID proof is the fallback. Reading only the ID proof showed "PAN -" for customers whose PAN was
+    // on file, and a search by PAN number found none of them.
     private static final String BASE_SELECT = """
             SELECT DISTINCT c.id AS client_id, c.display_name, c.mobile_no, o.name AS office_name,
                    acct.account_no, acct.account_type,
-                   pan.document_key AS pan_number, aad.document_key AS aadhaar_number,
+                   COALESCE(NULLIF(kyc.pan_number, ''), pan.document_key) AS pan_number, aad.document_key AS aadhaar_number,
                    addr.address_line_1, addr.address_line_2, addr.town_village, addr.city,
                    addr.county_district, addr.postal_code
             FROM m_client c
             LEFT JOIN m_office o ON o.id = c.office_id
+            LEFT JOIN m_client_kyc kyc ON kyc.client_id = c.id
             LEFT JOIN m_client_identifier pan ON pan.client_id = c.id AND pan.document_type_id = (
                 SELECT id FROM m_code_value WHERE code_value = 'PAN Card'
                 AND code_id = (SELECT id FROM m_code WHERE code_name = 'KYCIdProofType'))
@@ -100,7 +105,8 @@ public class CustomerSearchReadPlatformServiceImpl implements CustomerSearchRead
             params.add(aadhaarNumber.trim());
         }
         if (hasPan) {
-            sql.append(" AND UPPER(pan.document_key) = UPPER(?) ");
+            sql.append(" AND (UPPER(kyc.pan_number) = UPPER(?) OR UPPER(pan.document_key) = UPPER(?)) ");
+            params.add(panNumber.trim());
             params.add(panNumber.trim());
         }
         if (hasAddress) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentApiConstants.java

@@ -0,0 +1,95 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Constants for the Treasury Investment masters (Bank / Party Master and Script Master), modelled on the bank's existing
+ * CBS Investment screens.
+ */
+public final class InvestmentApiConstants {
+
+    private InvestmentApiConstants() {}
+
+    public static final String ENTITY_PARTY = "INVESTMENTPARTY";
+    public static final String ENTITY_SCRIPT = "INVESTMENTSCRIPT";
+    public static final String RESOURCE_PARTY = "investmentparty";
+    public static final String RESOURCE_SCRIPT = "investmentscript";
+
+    /** Instrument ("Bond Type") an investment party / script belongs to. */
+    public static final Set<String> BOND_TYPES = Set.of("GOVT_SECURITY", "NON_SLR", "BOND", "MUTUAL_FUND", "FD", "SHARE");
+
+    /** Bond types that carry coupon terms (ISIN, interest rate, issue date are mandatory for these). */
+    public static final Set<String> DEBT_BOND_TYPES = Set.of("GOVT_SECURITY", "NON_SLR", "BOND");
+
+    /** SLR classification on the Script Master ("GOI" = Central Government). */
+    public static final Set<String> SLR_TYPES = Set.of("GOI", "STATE_GOVT", "TREASURY", "NON_SLR");
+
+    /** Script Code prefix per bond type, e.g. G00001 for the first Govt Security. */
+    public static final Map<String, String> SCRIPT_CODE_PREFIX = Map.of("GOVT_SECURITY", "G", "NON_SLR", "N", "BOND", "B", "MUTUAL_FUND",
+            "M", "FD", "F", "SHARE", "S");
+
+    public static final String PARTY_CODE_PREFIX = "PTY-";
+
+    // Common parameters
+    public static final String BOND_TYPE = "bondType";
+    public static final String GL_ACCOUNT_ID = "glAccountId";
+    public static final String ADDRESS1 = "address1";
+    public static final String ADDRESS2 = "address2";
+    public static final String ADDRESS3 = "address3";
+    public static final String CITY = "city";
+    public static final String PINCODE = "pincode";
+    public static final String PHONE = "phone";
+    public static final String FAX = "fax";
+    public static final String ACTIVE = "active";
+    public static final String LOCALE = "locale";
+    public static final String DATE_FORMAT = "dateFormat";
+
+    // Party parameters
+    public static final String PARTY_NAME = "partyName";
+    public static final String BANK_TYPE = "bankType";
+    public static final String RBI_CODE = "rbiCode";
+    public static final String EXPOSURE_LIMIT = "limit";
+    public static final String LEI_NO = "leiNo";
+    public static final String CP_BANK_NAME = "cpBankName";
+    public static final String CP_BRANCH_NAME = "cpBranchName";
+    public static final String CP_ACCOUNT_NO = "cpAccountNo";
+    public static final String CP_IFSC = "cpIfsc";
+
+    // Script parameters
+    public static final String SLR_TYPE = "slrType";
+    public static final String SCRIPT_DESC = "scriptDesc";
+    public static final String ISIN = "isin";
+    public static final String FACE_VALUE_PER_UNIT = "faceValuePerUnit";
+    public static final String INT_RATE = "intRate";
+    public static final String ISSUE_DATE = "issueDate";
+    public static final String MATURITY_DATE = "maturityDate";
+    public static final String COMPANY_NAME = "companyName";
+    public static final String CORP_CODE = "corpCode";
+
+    public static final Set<String> PARTY_PARAMS = Set.of(BOND_TYPE, PARTY_NAME, ADDRESS1, ADDRESS2, ADDRESS3, CITY, PINCODE, PHONE, FAX,
+            BANK_TYPE, GL_ACCOUNT_ID, RBI_CODE, EXPOSURE_LIMIT, LEI_NO, CP_BANK_NAME, CP_BRANCH_NAME, CP_ACCOUNT_NO, CP_IFSC, ACTIVE,
+            LOCALE);
+
+    public static final Set<String> SCRIPT_PARAMS = Set.of(BOND_TYPE, SLR_TYPE, SCRIPT_DESC, GL_ACCOUNT_ID, ISIN, FACE_VALUE_PER_UNIT,
+            INT_RATE, ISSUE_DATE, MATURITY_DATE, COMPANY_NAME, ADDRESS1, ADDRESS2, ADDRESS3, CITY, PINCODE, PHONE, FAX, CORP_CODE,
+            ACTIVE, LOCALE, DATE_FORMAT);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentDailyRateApiConstants.java

@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import java.util.Set;
+
+/** Constants for the Daily Script Master (market rate of a script for a day). */
+public final class InvestmentDailyRateApiConstants {
+
+    private InvestmentDailyRateApiConstants() {}
+
+    public static final String ENTITY = "INVESTMENTDAILYRATE";
+    public static final String RESOURCE = "investmentdailyrate";
+
+    public static final String SCRIPT_ID = "scriptId";
+    public static final String RATE_DATE = "rateDate";
+    public static final String OPEN_RATE = "openRate";
+    public static final String HIGH_RATE = "highRate";
+    public static final String LOW_RATE = "lowRate";
+    public static final String CLOSE_RATE = "closeRate";
+    public static final String LOCALE = "locale";
+    public static final String DATE_FORMAT = "dateFormat";
+
+    public static final Set<String> PARAMS = Set.of(SCRIPT_ID, RATE_DATE, OPEN_RATE, HIGH_RATE, LOW_RATE, CLOSE_RATE, LOCALE, DATE_FORMAT);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentDailyRateApiResource.java

@@ -0,0 +1,96 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.commands.domain.CommandWrapper;
+import org.apache.fineract.commands.service.CommandWrapperBuilder;
+import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentDailyRateData;
+import org.apache.fineract.portfolio.investment.service.InvestmentDailyRateReadPlatformService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/daily-rates")
+@Component
+@Tag(name = "Investment Daily Script Master", description = "Market rate of each script for a day; Purchase Entry takes its rate from here.")
+@RequiredArgsConstructor
+public class InvestmentDailyRateApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentDailyRateReadPlatformService readPlatformService;
+    private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "List daily script rates, newest first")
+    public List<InvestmentDailyRateData> retrieveAll(@QueryParam("scriptId") @Parameter(description = "scriptId") final Long scriptId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentDailyRateApiConstants.ENTITY);
+        return this.readPlatformService.retrieveAll(scriptId);
+    }
+
+    @GET
+    @Path("latest")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Newest rate of a script on or before a date", description = "onDate (dd-MM-yyyy) defaults to the business "
+            + "date. Returns no content when no rate has been entered for the script.")
+    public InvestmentDailyRateData retrieveLatest(@QueryParam("scriptId") @Parameter(description = "scriptId") final Long scriptId,
+            @QueryParam("onDate") @Parameter(description = "dd-MM-yyyy") final String onDate) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentDailyRateApiConstants.ENTITY);
+        final LocalDate on = StringUtils.isBlank(onDate) ? DateUtils.getBusinessLocalDate()
+                : LocalDate.parse(onDate.trim(), DateTimeFormatter.ofPattern("dd-MM-yyyy"));
+        return this.readPlatformService.retrieveLatest(scriptId, on);
+    }
+
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Save a daily script rate")
+    public CommandProcessingResult create(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().createInvestmentDailyRate().withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @DELETE
+    @Path("{rateId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Drop a daily script rate")
+    public CommandProcessingResult delete(@PathParam("rateId") @Parameter(description = "rateId") final Long rateId) {
+        final CommandWrapper request = new CommandWrapperBuilder().deleteInvestmentDailyRate(rateId).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentInterestApiConstants.java

@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import java.util.Set;
+
+/** Constants for posting an interest schedule line (coupon or closing provision) of a holding to GL. */
+public final class InvestmentInterestApiConstants {
+
+    private InvestmentInterestApiConstants() {}
+
+    public static final String ENTITY = "INVESTMENTINTEREST";
+    public static final String RESOURCE = "investmentinterest";
+
+    public static final String LINE_TYPE = "lineType";
+    public static final String INT_DATE = "intDate";
+    /** Bank GL the coupon is received into; defaults to the purchase's paying bank. */
+    public static final String BANK_GL_ACCOUNT_ID = "bankGlAccountId";
+    public static final String LOCALE = "locale";
+    public static final String DATE_FORMAT = "dateFormat";
+
+    public static final Set<String> PARAMS = Set.of(LINE_TYPE, INT_DATE, BANK_GL_ACCOUNT_ID, LOCALE, DATE_FORMAT);
+
+    /** A line shows as a task this many days before its date (Jitendra Sir). */
+    public static final int DUE_WITHIN_DAYS = 2;
+
+    public static final String INTEREST_RECEIVABLE_GL_CODE = "100603";
+    public static final String INTEREST_INCOME_GOVT_SECURITIES_GL_CODE = "400401";
+    public static final String INTEREST_INCOME_BONDS_GL_CODE = "400402";
+
+    /** Income GL for a holding's interest: SLR govt securities, or bonds / debentures for the rest. */
+    public static String interestIncomeGlCode(final String bondType) {
+        return "GOVT_SECURITY".equals(bondType) ? INTEREST_INCOME_GOVT_SECURITIES_GL_CODE : INTEREST_INCOME_BONDS_GL_CODE;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentInterestApiResource.java

@@ -0,0 +1,55 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentInterestDueData;
+import org.apache.fineract.portfolio.investment.service.InvestmentPurchaseReadPlatformService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/interest-postings")
+@Component
+@Tag(name = "Investment Interest Posting", description = "Interest lines of holdings that are due to be posted with a voucher.")
+@RequiredArgsConstructor
+public class InvestmentInterestApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentPurchaseReadPlatformService readPlatformService;
+
+    @GET
+    @Path("due")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Interest lines due", description = "For every active holding, its next unposted interest line when that "
+            + "line's date is past or within withinDays days (default 2).")
+    public List<InvestmentInterestDueData> due(@QueryParam("withinDays") @Parameter(description = "withinDays") final Integer withinDays) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentInterestApiConstants.ENTITY);
+        return this.readPlatformService
+                .retrieveDueInterest(withinDays == null ? InvestmentInterestApiConstants.DUE_WITHIN_DAYS : withinDays);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentPartyApiResource.java

@@ -0,0 +1,99 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.domain.CommandWrapper;
+import org.apache.fineract.commands.service.CommandWrapperBuilder;
+import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentPartyData;
+import org.apache.fineract.portfolio.investment.service.InvestmentMasterReadPlatformService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/parties")
+@Component
+@Tag(name = "Investment Bank / Party Master", description = "Counterparties an investment is bought from or placed with.")
+@RequiredArgsConstructor
+public class InvestmentPartyApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentMasterReadPlatformService readPlatformService;
+    private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "List investment parties")
+    public List<InvestmentPartyData> retrieveAll() {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentApiConstants.ENTITY_PARTY);
+        return this.readPlatformService.retrieveAllParties();
+    }
+
+    @GET
+    @Path("{partyId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Retrieve an investment party")
+    public InvestmentPartyData retrieveOne(@PathParam("partyId") @Parameter(description = "partyId") final Long partyId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentApiConstants.ENTITY_PARTY);
+        return this.readPlatformService.retrieveParty(partyId);
+    }
+
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Create an investment party")
+    public CommandProcessingResult create(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().createInvestmentParty().withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @PUT
+    @Path("{partyId}")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Update an investment party")
+    public CommandProcessingResult update(@PathParam("partyId") @Parameter(description = "partyId") final Long partyId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().updateInvestmentParty(partyId).withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @DELETE
+    @Path("{partyId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Drop an investment party")
+    public CommandProcessingResult delete(@PathParam("partyId") @Parameter(description = "partyId") final Long partyId) {
+        final CommandWrapper request = new CommandWrapperBuilder().deleteInvestmentParty(partyId).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentPurchaseApiConstants.java

@@ -0,0 +1,70 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import java.util.Set;
+
+/** Constants for the Investment Purchase Entry (a deal that creates a holding). */
+public final class InvestmentPurchaseApiConstants {
+
+    private InvestmentPurchaseApiConstants() {}
+
+    public static final String ENTITY = "INVESTMENTPURCHASE";
+    public static final String RESOURCE = "investmentpurchase";
+
+    public static final Set<String> SETTLEMENT_TYPES = Set.of("T+0", "T+1", "T+2");
+    public static final Set<String> CATEGORIES = Set.of("HTM (Held To Maturity)", "AFS (Available For Sale)", "HFT (Held For Trading)");
+
+    /** Saved deal; nothing posted to GL until it is settled. */
+    public static final String STATUS_PENDING_SETTLEMENT = "PENDING_SETTLEMENT";
+    /** Settled: posted to GL on the settlement date, now a holding. */
+    public static final String STATUS_ACTIVE = "ACTIVE";
+
+    /** GLs the settlement entry debits besides the script's investment GL. */
+    public static final String BROKEN_PERIOD_INTEREST_GL_CODE = "500606";
+    public static final String STAMP_DUTY_GL_CODE = "500601";
+    public static final String BROKERAGE_GL_CODE = "500602";
+    public static final String OTHER_CHARGES_GL_CODE = "500603";
+
+    public static final String BOND_TYPE = "bondType";
+    public static final String SCRIPT_ID = "scriptId";
+    public static final String PARTY_ID = "partyId";
+    public static final String DEAL_DATE = "dealDate";
+    public static final String DEAL_TIME = "dealTime";
+    public static final String SETTLEMENT_TYPE = "settlementType";
+    public static final String FACE_VALUE = "faceValue";
+    public static final String PURCHASE_RATE = "purchaseRate";
+    public static final String CONSIDER_AMT = "considerAmt";
+    public static final String NAV = "nav";
+    public static final String STAMP_DUTY = "stampDuty";
+    public static final String BROKERAGE = "brokerage";
+    public static final String OTHER_CHARGES = "otherCharges";
+    public static final String CATEGORY = "category";
+    public static final String LAST_INT_DATE = "lastIntDate";
+    public static final String CR_GL_ACCOUNT_ID = "crGlAccountId";
+    public static final String SUB_TYPE = "subType";
+    /** Optional legacy fields (trade no, authorities, lien, delivery mode, …) kept as a JSON object. */
+    public static final String OTHER_DETAILS = "otherDetails";
+    public static final String LOCALE = "locale";
+    public static final String DATE_FORMAT = "dateFormat";
+
+    public static final Set<String> PARAMS = Set.of(BOND_TYPE, SCRIPT_ID, PARTY_ID, DEAL_DATE, DEAL_TIME, SETTLEMENT_TYPE, FACE_VALUE,
+            PURCHASE_RATE, CONSIDER_AMT, NAV, STAMP_DUTY, BROKERAGE, OTHER_CHARGES, CATEGORY, LAST_INT_DATE, CR_GL_ACCOUNT_ID, SUB_TYPE,
+            OTHER_DETAILS, LOCALE, DATE_FORMAT);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentPurchaseApiResource.java

@@ -0,0 +1,132 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.commands.domain.CommandWrapper;
+import org.apache.fineract.commands.service.CommandWrapperBuilder;
+import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentInterestScheduleData;
+import org.apache.fineract.portfolio.investment.data.InvestmentPurchaseData;
+import org.apache.fineract.portfolio.investment.service.InvestmentPurchaseReadPlatformService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/purchases")
+@Component
+@Tag(name = "Investment Purchase Entry", description = "Investment deals (Govt Security, Bond, Mutual Fund, …) — each becomes a holding.")
+@RequiredArgsConstructor
+public class InvestmentPurchaseApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentPurchaseReadPlatformService readPlatformService;
+    private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "List investment purchases (holdings)")
+    public List<InvestmentPurchaseData> retrieveAll() {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentPurchaseApiConstants.ENTITY);
+        return this.readPlatformService.retrieveAll();
+    }
+
+    @GET
+    @Path("{purchaseId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Retrieve an investment purchase")
+    public InvestmentPurchaseData retrieveOne(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentPurchaseApiConstants.ENTITY);
+        return this.readPlatformService.retrieveOne(purchaseId);
+    }
+
+    @GET
+    @Path("{purchaseId}/interest-schedule")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Interest schedule of a holding", description = "Half-yearly coupons and 31 Mar / 30 Sep closing provisions "
+            + "from purchase to maturity. Calculated only — nothing is posted. asOnDate (dd-MM-yyyy) defaults to the business date.")
+    public InvestmentInterestScheduleData retrieveInterestSchedule(
+            @PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId,
+            @QueryParam("asOnDate") @Parameter(description = "dd-MM-yyyy") final String asOnDate) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentPurchaseApiConstants.ENTITY);
+        final LocalDate asOn = StringUtils.isBlank(asOnDate) ? null
+                : LocalDate.parse(asOnDate.trim(), DateTimeFormatter.ofPattern("dd-MM-yyyy"));
+        return this.readPlatformService.retrieveInterestSchedule(purchaseId, asOn);
+    }
+
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Save a purchase entry")
+    public CommandProcessingResult create(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().createInvestmentPurchase().withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @POST
+    @Path("{purchaseId}/settle")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Settle a purchase", description = "On or after the settlement date: posts the purchase to GL dated the "
+            + "settlement date and makes the deal an active holding.")
+    public CommandProcessingResult settle(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().settleInvestmentPurchase(purchaseId)
+                .withJson(StringUtils.isBlank(apiRequestBodyAsJson) ? "{}" : apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @POST
+    @Path("{purchaseId}/interest-postings")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Post an interest line", description = "Posts the next interest schedule line (coupon or closing provision) "
+            + "of a holding to GL with a JV voucher, on or after its date and in date order.")
+    public CommandProcessingResult postInterest(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().postInvestmentInterest(purchaseId).withJson(apiRequestBodyAsJson)
+                .build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @DELETE
+    @Path("{purchaseId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Drop a purchase entry")
+    public CommandProcessingResult delete(@PathParam("purchaseId") @Parameter(description = "purchaseId") final Long purchaseId) {
+        final CommandWrapper request = new CommandWrapperBuilder().deleteInvestmentPurchase(purchaseId).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/api/InvestmentScriptApiResource.java

@@ -0,0 +1,89 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.domain.CommandWrapper;
+import org.apache.fineract.commands.service.CommandWrapperBuilder;
+import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.investment.data.InvestmentScriptData;
+import org.apache.fineract.portfolio.investment.service.InvestmentMasterReadPlatformService;
+import org.springframework.stereotype.Component;
+
+@Path("/v1/investment/scripts")
+@Component
+@Tag(name = "Investment Script Master", description = "Securities / instruments the bank invests in (Govt Security, Bond, Mutual Fund, …).")
+@RequiredArgsConstructor
+public class InvestmentScriptApiResource {
+
+    private final PlatformSecurityContext context;
+    private final InvestmentMasterReadPlatformService readPlatformService;
+    private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "List investment scripts")
+    public List<InvestmentScriptData> retrieveAll() {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentApiConstants.ENTITY_SCRIPT);
+        return this.readPlatformService.retrieveAllScripts();
+    }
+
+    @GET
+    @Path("{scriptId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Retrieve an investment script")
+    public InvestmentScriptData retrieveOne(@PathParam("scriptId") @Parameter(description = "scriptId") final Long scriptId) {
+        this.context.authenticatedUser().validateHasReadPermission(InvestmentApiConstants.ENTITY_SCRIPT);
+        return this.readPlatformService.retrieveScript(scriptId);
+    }
+
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Create an investment script")
+    public CommandProcessingResult create(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().createInvestmentScript().withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+
+    @PUT
+    @Path("{scriptId}")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Operation(summary = "Update an investment script")
+    public CommandProcessingResult update(@PathParam("scriptId") @Parameter(description = "scriptId") final Long scriptId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
+        final CommandWrapper request = new CommandWrapperBuilder().updateInvestmentScript(scriptId).withJson(apiRequestBodyAsJson).build();
+        return this.commandsSourceWritePlatformService.logCommandSource(request);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentDailyRateData.java

@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.time.format.DateTimeFormatter;
+import lombok.Builder;
+import lombok.Getter;
+import org.apache.fineract.portfolio.investment.domain.InvestmentDailyRate;
+
+@Getter
+@Builder
+public class InvestmentDailyRateData {
+
+    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+
+    private final Long id;
+    private final Long scriptId;
+    private final String scriptCode;
+    private final String scriptDesc;
+    private final String bondType;
+    private final String rateDate;
+    private final BigDecimal openRate;
+    private final BigDecimal highRate;
+    private final BigDecimal lowRate;
+    private final BigDecimal closeRate;
+
+    public static InvestmentDailyRateData from(final InvestmentDailyRate r) {
+        return InvestmentDailyRateData.builder().id(r.getId()).scriptId(r.getScript().getId()).scriptCode(r.getScript().getScriptCode())
+                .scriptDesc(r.getScript().getScriptDesc()).bondType(r.getScript().getBondType())
+                .rateDate(r.getRateDate().format(DATE_FORMAT)).openRate(r.getOpenRate()).highRate(r.getHighRate()).lowRate(r.getLowRate())
+                .closeRate(r.getCloseRate()).build();
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentInterestDueData.java

@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import lombok.Builder;
+import lombok.Getter;
+
+/** The next unposted interest line of a holding that is due, or due within the reminder window — a task to post. */
+@Getter
+@Builder
+public class InvestmentInterestDueData {
+
+    private final Long purchaseId;
+    private final String dealNo;
+    private final String certNo;
+    private final String scriptCode;
+    private final String scriptDesc;
+    private final String lineType;
+    private final String intDate;
+    private final BigDecimal grossInterest;
+    private final BigDecimal amount;
+    /** The date has come: it can be posted now. */
+    private final boolean postable;
+    /** The date has passed without posting. */
+    private final boolean overdue;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentInterestScheduleData.java

@@ -0,0 +1,91 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.util.List;
+import lombok.Builder;
+import lombok.Getter;
+
+/**
+ * Interest schedule of one holding: every half-yearly coupon and every 31 March / 30 September closing provision from
+ * purchase to maturity. Calculated, not yet posted.
+ */
+@Getter
+@Builder
+public class InvestmentInterestScheduleData {
+
+    private final Long purchaseId;
+    private final String dealNo;
+    private final String certNo;
+    private final String scriptCode;
+    private final String scriptDesc;
+    private final BigDecimal faceValue;
+    private final BigDecimal unitValue;
+    private final BigDecimal balanceUnits;
+    private final BigDecimal purchaseRate;
+    private final BigDecimal bookValue;
+    private final BigDecimal intRate;
+    private final String dealDate;
+    private final String lastIntDate;
+    private final String maturityDate;
+    /**
+     * Broken-period interest paid to the seller at purchase — booked as an expense (GL 500606), not in this schedule.
+     */
+    private final BigDecimal purchasedAccruedInterest;
+    private final BigDecimal couponPerHalfYear;
+    private final String asOnDate;
+    private final String interestGlCode;
+    private final String interestGlName;
+    /** Bank the coupon is received into by default: the purchase's paying bank. */
+    private final Long bankGlAccountId;
+    private final String bankGlCode;
+    private final String bankGlName;
+    private final String status;
+    private final List<Row> rows;
+
+    @Getter
+    @Builder
+    public static class Row {
+
+        /** COUPON (cash received) or PROVISION (closing accrual). */
+        private final String type;
+        private final String intDate;
+        private final String fromDate;
+        private final String toDate;
+        private final int days;
+        /** Coupon received, or interest earned since the last coupon up to the closing. */
+        private final BigDecimal grossInterest;
+        /** Interest Receivable balance before this line (purchased accrued interest / earlier provision). */
+        private final BigDecimal alreadyBooked;
+        /** Provision to book now, or the part of the coupon that is new income. */
+        private final BigDecimal amount;
+        /** True when the date is on or before the as-on date. */
+        private final boolean due;
+        /** Posted to GL: its JV voucher and GL transaction. */
+        private final boolean posted;
+        private final String voucherNo;
+        private final String glTransactionId;
+        private final String postedOnDate;
+        /** The next line to post and its date has come. */
+        private final boolean postable;
+        /** Unposted and its date is within the reminder window (or past). */
+        private final boolean dueSoon;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentPartyData.java

@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import lombok.Builder;
+import lombok.Getter;
+import org.apache.fineract.portfolio.investment.domain.InvestmentParty;
+
+@Getter
+@Builder
+public class InvestmentPartyData {
+
+    private final Long id;
+    private final String partyCode;
+    private final String bondType;
+    private final String partyName;
+    private final String address1;
+    private final String address2;
+    private final String address3;
+    private final String city;
+    private final String pincode;
+    private final String phone;
+    private final String fax;
+    private final String bankType;
+    private final Long glAccountId;
+    private final String glCode;
+    private final String glName;
+    private final String rbiCode;
+    private final BigDecimal limit;
+    private final String leiNo;
+    private final String cpBankName;
+    private final String cpBranchName;
+    private final String cpAccountNo;
+    private final String cpIfsc;
+    private final boolean active;
+
+    public static InvestmentPartyData from(final InvestmentParty p) {
+        return InvestmentPartyData.builder().id(p.getId()).partyCode(p.getPartyCode()).bondType(p.getBondType())
+                .partyName(p.getPartyName()).address1(p.getAddress1()).address2(p.getAddress2()).address3(p.getAddress3())
+                .city(p.getCity()).pincode(p.getPincode()).phone(p.getPhone()).fax(p.getFax()).bankType(p.getBankType())
+                .glAccountId(p.getGlAccount().getId()).glCode(p.getGlAccount().getGlCode()).glName(p.getGlAccount().getName())
+                .rbiCode(p.getRbiCode()).limit(p.getExposureLimit()).leiNo(p.getLeiNo()).cpBankName(p.getCpBankName())
+                .cpBranchName(p.getCpBranchName()).cpAccountNo(p.getCpAccountNo()).cpIfsc(p.getCpIfsc()).active(p.isActive()).build();
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentPurchaseData.java

@@ -0,0 +1,100 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import lombok.Builder;
+import lombok.Getter;
+import org.apache.fineract.portfolio.investment.domain.InvestmentPurchase;
+
+@Getter
+@Builder
+public class InvestmentPurchaseData {
+
+    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+
+    private final Long id;
+    private final String dealNo;
+    private final String certNo;
+    private final String bondType;
+    private final Long scriptId;
+    private final String scriptCode;
+    private final String scriptDesc;
+    private final String isin;
+    private final Long partyId;
+    private final String partyCode;
+    private final String partyName;
+    private final String dealDate;
+    private final String dealTime;
+    private final String settlementType;
+    private final String settlementDate;
+    private final BigDecimal faceValue;
+    private final BigDecimal purchaseRate;
+    private final BigDecimal units;
+    private final BigDecimal balanceUnits;
+    private final BigDecimal brokerage;
+    private final BigDecimal stampDuty;
+    private final BigDecimal otherCharges;
+    private final BigDecimal bookValue;
+    private final BigDecimal premiumDiscount;
+    private final BigDecimal intRate;
+    private final String issueDate;
+    private final String maturityDate;
+    private final String lastIntDate;
+    private final Integer accruedDays;
+    private final BigDecimal accruedInterest;
+    private final BigDecimal settlementAmount;
+    private final BigDecimal ytm;
+    private final String category;
+    private final String subType;
+    private final Long investmentGlAccountId;
+    private final String investmentGlCode;
+    private final String investmentGlName;
+    private final Long crGlAccountId;
+    private final String crGlCode;
+    private final String crGlName;
+    private final String otherDetails;
+    private final String status;
+    private final String glTransactionId;
+    private final String settledOnDate;
+
+    public static InvestmentPurchaseData from(final InvestmentPurchase p) {
+        return InvestmentPurchaseData.builder().id(p.getId()).dealNo(p.getDealNo()).certNo(p.getCertNo()).bondType(p.getBondType())
+                .scriptId(p.getScript().getId()).scriptCode(p.getScript().getScriptCode()).scriptDesc(p.getScript().getScriptDesc())
+                .isin(p.getScript().getIsin()).partyId(p.getParty().getId()).partyCode(p.getParty().getPartyCode())
+                .partyName(p.getParty().getPartyName()).dealDate(format(p.getDealDate())).dealTime(p.getDealTime())
+                .settlementType(p.getSettlementType()).settlementDate(format(p.getSettlementDate())).faceValue(p.getFaceValue())
+                .purchaseRate(p.getPurchaseRate()).units(p.getUnits()).balanceUnits(p.getBalanceUnits()).brokerage(p.getBrokerage())
+                .stampDuty(p.getStampDuty()).otherCharges(p.getOtherCharges()).bookValue(p.getBookValue())
+                .premiumDiscount(p.getPremiumDiscount()).intRate(p.getIntRate()).issueDate(format(p.getIssueDate()))
+                .maturityDate(format(p.getMaturityDate())).lastIntDate(format(p.getLastIntDate())).accruedDays(p.getAccruedDays())
+                .accruedInterest(p.getAccruedInterest()).settlementAmount(p.getSettlementAmount()).ytm(p.getYtm()).category(p.getCategory())
+                .subType(p.getSubType()).investmentGlAccountId(p.getInvestmentGlAccount().getId())
+                .investmentGlCode(p.getInvestmentGlAccount().getGlCode()).investmentGlName(p.getInvestmentGlAccount().getName())
+                .crGlAccountId(p.getCrGlAccount().getId()).crGlCode(p.getCrGlAccount().getGlCode()).crGlName(p.getCrGlAccount().getName())
+                .otherDetails(p.getOtherDetails()).status(p.getStatus()).glTransactionId(p.getGlTransactionId())
+                .settledOnDate(format(p.getSettledOnDate())).build();
+    }
+
+    private static String format(final LocalDate date) {
+        return date == null ? null : date.format(DATE_FORMAT);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/data/InvestmentScriptData.java

@@ -0,0 +1,72 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import lombok.Builder;
+import lombok.Getter;
+import org.apache.fineract.portfolio.investment.domain.InvestmentScript;
+
+@Getter
+@Builder
+public class InvestmentScriptData {
+
+    /** Dates go out as DD-MM-YYYY, the format the Investment screens use throughout. */
+    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+
+    private final Long id;
+    private final String scriptCode;
+    private final String bondType;
+    private final String slrType;
+    private final String scriptDesc;
+    private final Long glAccountId;
+    private final String glCode;
+    private final String glName;
+    private final String isin;
+    private final BigDecimal faceValuePerUnit;
+    private final BigDecimal intRate;
+    private final String issueDate;
+    private final String maturityDate;
+    private final String companyName;
+    private final String address1;
+    private final String address2;
+    private final String address3;
+    private final String city;
+    private final String pincode;
+    private final String phone;
+    private final String fax;
+    private final String corpCode;
+    private final boolean active;
+
+    public static InvestmentScriptData from(final InvestmentScript s) {
+        return InvestmentScriptData.builder().id(s.getId()).scriptCode(s.getScriptCode()).bondType(s.getBondType())
+                .slrType(s.getSlrType()).scriptDesc(s.getScriptDesc()).glAccountId(s.getGlAccount().getId())
+                .glCode(s.getGlAccount().getGlCode()).glName(s.getGlAccount().getName()).isin(s.getIsin())
+                .faceValuePerUnit(s.getFaceValuePerUnit()).intRate(s.getIntRate()).issueDate(format(s.getIssueDate()))
+                .maturityDate(format(s.getMaturityDate())).companyName(s.getCompanyName()).address1(s.getAddress1())
+                .address2(s.getAddress2()).address3(s.getAddress3()).city(s.getCity()).pincode(s.getPincode()).phone(s.getPhone())
+                .fax(s.getFax()).corpCode(s.getCorpCode()).active(s.isActive()).build();
+    }
+
+    private static String format(final LocalDate date) {
+        return date == null ? null : date.format(DATE_FORMAT);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentDailyRate.java

@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/**
+ * Daily Script Master: the market rate of a script for one day, as the bank's existing CBS keeps it. Purchase Entry
+ * takes its rate from here (Jitendra Sir). Close rate is mandatory; open, high and low are optional.
+ */
+@Entity
+@Table(name = "m_investment_daily_rate")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentDailyRate extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    @ManyToOne
+    @JoinColumn(name = "script_id", nullable = false)
+    private InvestmentScript script;
+
+    @Column(name = "rate_date", nullable = false)
+    private LocalDate rateDate;
+
+    @Column(name = "open_rate", scale = 6, precision = 19)
+    private BigDecimal openRate;
+
+    @Column(name = "high_rate", scale = 6, precision = 19)
+    private BigDecimal highRate;
+
+    @Column(name = "low_rate", scale = 6, precision = 19)
+    private BigDecimal lowRate;
+
+    @Column(name = "close_rate", scale = 6, precision = 19, nullable = false)
+    private BigDecimal closeRate;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentDailyRateRepository.java

@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentDailyRateRepository extends JpaRepository<InvestmentDailyRate, Long> {
+
+    boolean existsByScriptIdAndRateDate(Long scriptId, LocalDate rateDate);
+
+    /** The newest rate of a script on or before a date. */
+    Optional<InvestmentDailyRate> findFirstByScriptIdAndRateDateLessThanEqualOrderByRateDateDesc(Long scriptId, LocalDate onDate);
+
+    List<InvestmentDailyRate> findByScriptIdOrderByRateDateDesc(Long scriptId);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentInterestPosting.java

@@ -0,0 +1,84 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/** One interest schedule line of a holding (coupon received or closing provision) that has been posted to GL. */
+@Entity
+@Table(name = "m_investment_interest_posting")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentInterestPosting extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    @ManyToOne
+    @JoinColumn(name = "purchase_id", nullable = false)
+    private InvestmentPurchase purchase;
+
+    /** COUPON or PROVISION. */
+    @Column(name = "line_type", nullable = false, length = 20)
+    private String lineType;
+
+    @Column(name = "int_date", nullable = false)
+    private LocalDate intDate;
+
+    @Column(name = "from_date")
+    private LocalDate fromDate;
+
+    @Column(name = "to_date")
+    private LocalDate toDate;
+
+    @Column(name = "days")
+    private Integer days;
+
+    @Column(name = "gross_interest", scale = 6, precision = 19)
+    private BigDecimal grossInterest;
+
+    @Column(name = "already_booked", scale = 6, precision = 19)
+    private BigDecimal alreadyBooked;
+
+    @Column(name = "amount", scale = 6, precision = 19, nullable = false)
+    private BigDecimal amount;
+
+    /** Bank the coupon was received into (coupon lines only). */
+    @ManyToOne
+    @JoinColumn(name = "bank_gl_account_id")
+    private GLAccount bankGlAccount;
+
+    @Column(name = "gl_transaction_id", length = 50)
+    private String glTransactionId;
+
+    @Column(name = "voucher_no", length = 30)
+    private String voucherNo;
+
+    @Column(name = "posted_on_date")
+    private LocalDate postedOnDate;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentInterestPostingRepository.java

@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentInterestPostingRepository extends JpaRepository<InvestmentInterestPosting, Long> {
+
+    List<InvestmentInterestPosting> findByPurchaseIdOrderByIntDateAsc(Long purchaseId);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentParty.java

@@ -0,0 +1,105 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/**
+ * Bank / Party Master — the counterparty an investment is bought from or placed with (bank, RBI, issuer, AMC, broker),
+ * following the bank's existing CBS Bank / Party Master.
+ */
+@Entity
+@Table(name = "m_investment_party")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentParty extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    @Column(name = "party_code", nullable = false, length = 20, unique = true)
+    private String partyCode;
+
+    @Column(name = "bond_type", nullable = false, length = 20)
+    private String bondType;
+
+    @Column(name = "party_name", nullable = false, length = 150)
+    private String partyName;
+
+    @Column(name = "address1", length = 150)
+    private String address1;
+
+    @Column(name = "address2", length = 150)
+    private String address2;
+
+    @Column(name = "address3", length = 150)
+    private String address3;
+
+    @Column(name = "city", length = 100)
+    private String city;
+
+    @Column(name = "pincode", length = 10)
+    private String pincode;
+
+    @Column(name = "phone", length = 20)
+    private String phone;
+
+    @Column(name = "fax", length = 20)
+    private String fax;
+
+    @Column(name = "bank_type", length = 60)
+    private String bankType;
+
+    @ManyToOne
+    @JoinColumn(name = "gl_account_id", nullable = false)
+    private GLAccount glAccount;
+
+    @Column(name = "rbi_code", length = 30)
+    private String rbiCode;
+
+    @Column(name = "exposure_limit", scale = 6, precision = 19)
+    private BigDecimal exposureLimit;
+
+    @Column(name = "lei_no", length = 30)
+    private String leiNo;
+
+    @Column(name = "cp_bank_name", length = 150)
+    private String cpBankName;
+
+    @Column(name = "cp_branch_name", length = 150)
+    private String cpBranchName;
+
+    @Column(name = "cp_account_no", length = 40)
+    private String cpAccountNo;
+
+    @Column(name = "cp_ifsc", length = 11)
+    private String cpIfsc;
+
+    /** An inactive party is kept for history but not offered for new deals. */
+    @Column(name = "is_active", nullable = false)
+    private boolean active = true;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentPartyRepository.java

@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentPartyRepository extends JpaRepository<InvestmentParty, Long> {}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentPurchase.java

@@ -0,0 +1,158 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/**
+ * Investment Purchase Entry — one deal (as in the bank's existing CBS "Govt.Security/Bond Entry"). Once saved it is the
+ * holding that interest, sale and redemption later work against; {@link #balanceUnits} tracks what is still held. Every
+ * derived figure (units, book value, accrued interest, settlement amount) is computed by the backend.
+ */
+@Entity
+@Table(name = "m_investment_purchase")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentPurchase extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    /** Financial-year deal number, e.g. 202627000001 for the first deal of FY 2026-27. */
+    @Column(name = "deal_no", nullable = false, length = 20, unique = true)
+    private String dealNo;
+
+    /** Certificate number — system-generated running number. */
+    @Column(name = "cert_no", nullable = false, length = 20, unique = true)
+    private String certNo;
+
+    @Column(name = "bond_type", nullable = false, length = 20)
+    private String bondType;
+
+    @ManyToOne
+    @JoinColumn(name = "script_id", nullable = false)
+    private InvestmentScript script;
+
+    @ManyToOne
+    @JoinColumn(name = "party_id", nullable = false)
+    private InvestmentParty party;
+
+    @Column(name = "deal_date", nullable = false)
+    private LocalDate dealDate;
+
+    @Column(name = "deal_time", length = 8)
+    private String dealTime;
+
+    @Column(name = "settlement_type", nullable = false, length = 5)
+    private String settlementType;
+
+    @Column(name = "settlement_date", nullable = false)
+    private LocalDate settlementDate;
+
+    @Column(name = "face_value", scale = 6, precision = 19, nullable = false)
+    private BigDecimal faceValue;
+
+    /** Price per ₹100 face value (Govt Security / Bond); NAV for a mutual fund. */
+    @Column(name = "purchase_rate", scale = 6, precision = 19, nullable = false)
+    private BigDecimal purchaseRate;
+
+    @Column(name = "units", scale = 6, precision = 19, nullable = false)
+    private BigDecimal units;
+
+    @Column(name = "balance_units", scale = 6, precision = 19, nullable = false)
+    private BigDecimal balanceUnits;
+
+    @Column(name = "brokerage", scale = 6, precision = 19)
+    private BigDecimal brokerage;
+
+    @Column(name = "stamp_duty", scale = 6, precision = 19)
+    private BigDecimal stampDuty;
+
+    @Column(name = "other_charges", scale = 6, precision = 19)
+    private BigDecimal otherCharges;
+
+    @Column(name = "book_value", scale = 6, precision = 19, nullable = false)
+    private BigDecimal bookValue;
+
+    @Column(name = "premium_discount", scale = 6, precision = 19)
+    private BigDecimal premiumDiscount;
+
+    @Column(name = "int_rate", scale = 4, precision = 9)
+    private BigDecimal intRate;
+
+    @Column(name = "issue_date")
+    private LocalDate issueDate;
+
+    @Column(name = "maturity_date")
+    private LocalDate maturityDate;
+
+    @Column(name = "last_int_date")
+    private LocalDate lastIntDate;
+
+    @Column(name = "accrued_days")
+    private Integer accruedDays;
+
+    /** Interest paid to the seller from the last coupon date up to the deal date (30/360). */
+    @Column(name = "accrued_interest", scale = 6, precision = 19)
+    private BigDecimal accruedInterest;
+
+    @Column(name = "settlement_amount", scale = 6, precision = 19, nullable = false)
+    private BigDecimal settlementAmount;
+
+    @Column(name = "ytm", scale = 4, precision = 9)
+    private BigDecimal ytm;
+
+    @Column(name = "category", nullable = false, length = 40)
+    private String category;
+
+    @Column(name = "sub_type", length = 40)
+    private String subType;
+
+    /** Investment GL the holding is booked to (from the script). */
+    @ManyToOne
+    @JoinColumn(name = "investment_gl_account_id", nullable = false)
+    private GLAccount investmentGlAccount;
+
+    /** Bank GL the purchase is paid from ("CR. To A/c"). */
+    @ManyToOne
+    @JoinColumn(name = "cr_gl_account_id", nullable = false)
+    private GLAccount crGlAccount;
+
+    @Column(name = "other_details", length = 4000)
+    private String otherDetails;
+
+    @Column(name = "status", nullable = false, length = 20)
+    private String status;
+
+    /** Journal entry transaction posted when the deal was settled. */
+    @Column(name = "gl_transaction_id", length = 50)
+    private String glTransactionId;
+
+    @Column(name = "settled_on_date")
+    private LocalDate settledOnDate;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentPurchaseRepository.java

@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentPurchaseRepository extends JpaRepository<InvestmentPurchase, Long> {}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentScript.java

@@ -0,0 +1,107 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
+
+/**
+ * Script Master — what is being bought (a Govt Security, bond, mutual fund scheme, share, …), following the bank's
+ * existing CBS Script Master. A purchase picks these terms up instead of the dealer re-typing them.
+ */
+@Entity
+@Table(name = "m_investment_script")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InvestmentScript extends AbstractAuditableWithUTCDateTimeCustom<Long> {
+
+    /** System-generated: bond-type letter + running number, e.g. G00001. */
+    @Column(name = "script_code", nullable = false, length = 20, unique = true)
+    private String scriptCode;
+
+    @Column(name = "bond_type", nullable = false, length = 20)
+    private String bondType;
+
+    /** GOI / STATE_GOVT / TREASURY / NON_SLR. */
+    @Column(name = "slr_type", length = 20)
+    private String slrType;
+
+    @Column(name = "script_desc", nullable = false, length = 150)
+    private String scriptDesc;
+
+    @ManyToOne
+    @JoinColumn(name = "gl_account_id", nullable = false)
+    private GLAccount glAccount;
+
+    @Column(name = "isin", length = 20)
+    private String isin;
+
+    @Column(name = "face_value_per_unit", scale = 6, precision = 19, nullable = false)
+    private BigDecimal faceValuePerUnit;
+
+    @Column(name = "int_rate", scale = 4, precision = 9)
+    private BigDecimal intRate;
+
+    @Column(name = "issue_date")
+    private LocalDate issueDate;
+
+    @Column(name = "maturity_date")
+    private LocalDate maturityDate;
+
+    @Column(name = "company_name", length = 150)
+    private String companyName;
+
+    @Column(name = "address1", length = 150)
+    private String address1;
+
+    @Column(name = "address2", length = 150)
+    private String address2;
+
+    @Column(name = "address3", length = 150)
+    private String address3;
+
+    @Column(name = "city", length = 100)
+    private String city;
+
+    @Column(name = "pincode", length = 10)
+    private String pincode;
+
+    @Column(name = "phone", length = 20)
+    private String phone;
+
+    @Column(name = "fax", length = 20)
+    private String fax;
+
+    @Column(name = "corp_code", length = 30)
+    private String corpCode;
+
+    @Column(name = "is_active", nullable = false)
+    private boolean active = true;
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/domain/InvestmentScriptRepository.java

@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.domain;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InvestmentScriptRepository extends JpaRepository<InvestmentScript, Long> {}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/exception/InvestmentDailyRateNotFoundException.java

@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.exception;
+
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
+
+public class InvestmentDailyRateNotFoundException extends AbstractPlatformResourceNotFoundException {
+
+    public InvestmentDailyRateNotFoundException(final Long id) {
+        super("error.msg.investmentdailyrate.id.invalid", "Daily script rate with identifier " + id + " does not exist", id);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/exception/InvestmentPartyNotFoundException.java

@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.exception;
+
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
+
+public class InvestmentPartyNotFoundException extends AbstractPlatformResourceNotFoundException {
+
+    public InvestmentPartyNotFoundException(final Long id) {
+        super("error.msg.investmentparty.id.invalid", "Investment party with identifier " + id + " does not exist", id);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/exception/InvestmentPurchaseNotFoundException.java

@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.exception;
+
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
+
+public class InvestmentPurchaseNotFoundException extends AbstractPlatformResourceNotFoundException {
+
+    public InvestmentPurchaseNotFoundException(final Long id) {
+        super("error.msg.investmentpurchase.id.invalid", "Investment purchase with identifier " + id + " does not exist", id);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/exception/InvestmentScriptNotFoundException.java

@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.exception;
+
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
+
+public class InvestmentScriptNotFoundException extends AbstractPlatformResourceNotFoundException {
+
+    public InvestmentScriptNotFoundException(final Long id) {
+        super("error.msg.investmentscript.id.invalid", "Investment script with identifier " + id + " does not exist", id);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/CreateInvestmentDailyRateCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentDailyRateWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTDAILYRATE", action = "CREATE")
+@RequiredArgsConstructor
+public class CreateInvestmentDailyRateCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentDailyRateWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.createDailyRate(command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/CreateInvestmentPartyCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentMasterWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTPARTY", action = "CREATE")
+@RequiredArgsConstructor
+public class CreateInvestmentPartyCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentMasterWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.createParty(command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/CreateInvestmentPurchaseCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentPurchaseWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTPURCHASE", action = "CREATE")
+@RequiredArgsConstructor
+public class CreateInvestmentPurchaseCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentPurchaseWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.createPurchase(command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/CreateInvestmentScriptCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentMasterWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTSCRIPT", action = "CREATE")
+@RequiredArgsConstructor
+public class CreateInvestmentScriptCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentMasterWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.createScript(command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/DeleteInvestmentDailyRateCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentDailyRateWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTDAILYRATE", action = "DELETE")
+@RequiredArgsConstructor
+public class DeleteInvestmentDailyRateCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentDailyRateWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.deleteDailyRate(command.entityId());
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/DeleteInvestmentPartyCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentMasterWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTPARTY", action = "DELETE")
+@RequiredArgsConstructor
+public class DeleteInvestmentPartyCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentMasterWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.deleteParty(command.entityId());
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/DeleteInvestmentPurchaseCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentPurchaseWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTPURCHASE", action = "DELETE")
+@RequiredArgsConstructor
+public class DeleteInvestmentPurchaseCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentPurchaseWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.deletePurchase(command.entityId());
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/PostInvestmentInterestCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentInterestPostingWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTINTEREST", action = "CREATE")
+@RequiredArgsConstructor
+public class PostInvestmentInterestCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentInterestPostingWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.postInterest(command.entityId(), command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/SettleInvestmentPurchaseCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentPurchaseWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTPURCHASE", action = "SETTLE")
+@RequiredArgsConstructor
+public class SettleInvestmentPurchaseCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentPurchaseWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.settlePurchase(command.entityId(), command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/UpdateInvestmentPartyCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentMasterWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTPARTY", action = "UPDATE")
+@RequiredArgsConstructor
+public class UpdateInvestmentPartyCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentMasterWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.updateParty(command.entityId(), command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/handler/UpdateInvestmentScriptCommandHandler.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.handler;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.commands.annotation.CommandType;
+import org.apache.fineract.commands.handler.NewCommandSourceHandler;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.portfolio.investment.service.InvestmentMasterWritePlatformService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@CommandType(entity = "INVESTMENTSCRIPT", action = "UPDATE")
+@RequiredArgsConstructor
+public class UpdateInvestmentScriptCommandHandler implements NewCommandSourceHandler {
+
+    private final InvestmentMasterWritePlatformService writePlatformService;
+
+    @Transactional
+    @Override
+    public CommandProcessingResult processCommand(final JsonCommand command) {
+        return this.writePlatformService.updateScript(command.entityId(), command);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/serialization/InvestmentDailyRateCommandFromApiJsonDeserializer.java

@@ -0,0 +1,103 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.serialization;
+
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.CLOSE_RATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.HIGH_RATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.LOW_RATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.OPEN_RATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.PARAMS;
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.RATE_DATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.RESOURCE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.SCRIPT_ID;
+
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.infrastructure.core.data.ApiParameterError;
+import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
+import org.apache.fineract.infrastructure.core.exception.InvalidJsonException;
+import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
+import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
+import org.springframework.stereotype.Component;
+
+/** Validates a Daily Script Master entry: close rate is mandatory and the day's rates must sit inside low to high. */
+@Component
+@RequiredArgsConstructor
+public final class InvestmentDailyRateCommandFromApiJsonDeserializer {
+
+    private final FromJsonHelper fromApiJsonHelper;
+
+    public void validateForCreate(final String json) {
+        if (StringUtils.isBlank(json)) {
+            throw new InvalidJsonException();
+        }
+        final Type typeOfMap = new TypeToken<Map<String, Object>>() {}.getType();
+        this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, PARAMS);
+        final JsonElement element = this.fromApiJsonHelper.parse(json);
+
+        final List<ApiParameterError> errors = new ArrayList<>();
+        final DataValidatorBuilder v = new DataValidatorBuilder(errors).resource(RESOURCE);
+
+        v.reset().parameter(SCRIPT_ID).value(this.fromApiJsonHelper.extractLongNamed(SCRIPT_ID, element)).notNull().longGreaterThanZero();
+        v.reset().parameter(RATE_DATE).value(this.fromApiJsonHelper.extractLocalDateNamed(RATE_DATE, element)).notNull();
+        final BigDecimal close = amount(CLOSE_RATE, element);
+        final BigDecimal open = amount(OPEN_RATE, element);
+        final BigDecimal high = amount(HIGH_RATE, element);
+        final BigDecimal low = amount(LOW_RATE, element);
+        v.reset().parameter(CLOSE_RATE).value(close).notNull().positiveAmount();
+        v.reset().parameter(OPEN_RATE).value(open).ignoreIfNull().positiveAmount();
+        v.reset().parameter(HIGH_RATE).value(high).ignoreIfNull().positiveAmount();
+        v.reset().parameter(LOW_RATE).value(low).ignoreIfNull().positiveAmount();
+
+        if (high != null && low != null && high.compareTo(low) < 0) {
+            v.reset().parameter(HIGH_RATE).failWithCodeAndMessage("less.than.low.rate", "High Rate cannot be below Low Rate");
+        }
+        outsideRange(v, CLOSE_RATE, "Close Rate", close, low, high);
+        outsideRange(v, OPEN_RATE, "Open Rate", open, low, high);
+
+        if (!errors.isEmpty()) {
+            throw new PlatformApiDataValidationException("validation.msg.validation.errors.exist", "Validation errors exist.", errors);
+        }
+    }
+
+    private static void outsideRange(final DataValidatorBuilder v, final String param, final String label, final BigDecimal rate,
+            final BigDecimal low, final BigDecimal high) {
+        if (rate == null) {
+            return;
+        }
+        if (low != null && rate.compareTo(low) < 0) {
+            v.reset().parameter(param).failWithCodeAndMessage("below.low.rate", label + " cannot be below Low Rate");
+        } else if (high != null && rate.compareTo(high) > 0) {
+            v.reset().parameter(param).failWithCodeAndMessage("above.high.rate", label + " cannot be above High Rate");
+        }
+    }
+
+    private BigDecimal amount(final String param, final JsonElement element) {
+        return this.fromApiJsonHelper.parameterExists(param, element)
+                ? this.fromApiJsonHelper.extractBigDecimalWithLocaleNamed(param, element)
+                : null;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/serialization/InvestmentInterestCommandFromApiJsonDeserializer.java

@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.serialization;
+
+import static org.apache.fineract.portfolio.investment.api.InvestmentInterestApiConstants.BANK_GL_ACCOUNT_ID;
+import static org.apache.fineract.portfolio.investment.api.InvestmentInterestApiConstants.INT_DATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentInterestApiConstants.LINE_TYPE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentInterestApiConstants.PARAMS;
+import static org.apache.fineract.portfolio.investment.api.InvestmentInterestApiConstants.RESOURCE;
+
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.infrastructure.core.data.ApiParameterError;
+import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
+import org.apache.fineract.infrastructure.core.exception.InvalidJsonException;
+import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
+import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
+import org.apache.fineract.portfolio.investment.service.InvestmentInterestCalculator;
+import org.springframework.stereotype.Component;
+
+/** Validates a request to post one interest schedule line. */
+@Component
+@RequiredArgsConstructor
+public final class InvestmentInterestCommandFromApiJsonDeserializer {
+
+    private final FromJsonHelper fromApiJsonHelper;
+
+    public void validateForPost(final String json) {
+        if (StringUtils.isBlank(json)) {
+            throw new InvalidJsonException();
+        }
+        final Type typeOfMap = new TypeToken<Map<String, Object>>() {}.getType();
+        this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, PARAMS);
+        final JsonElement element = this.fromApiJsonHelper.parse(json);
+
+        final List<ApiParameterError> errors = new ArrayList<>();
+        final DataValidatorBuilder v = new DataValidatorBuilder(errors).resource(RESOURCE);
+        final String lineType = this.fromApiJsonHelper.extractStringNamed(LINE_TYPE, element);
+        v.reset().parameter(LINE_TYPE).value(lineType).notBlank();
+        if (StringUtils.isNotBlank(lineType)) {
+            v.reset().parameter(LINE_TYPE).value(lineType).isOneOfTheseValues(InvestmentInterestCalculator.TYPE_COUPON,
+                    InvestmentInterestCalculator.TYPE_PROVISION);
+        }
+        v.reset().parameter(INT_DATE).value(this.fromApiJsonHelper.extractLocalDateNamed(INT_DATE, element)).notNull();
+        v.reset().parameter(BANK_GL_ACCOUNT_ID).value(this.fromApiJsonHelper.extractLongNamed(BANK_GL_ACCOUNT_ID, element)).ignoreIfNull()
+                .longGreaterThanZero();
+        if (!errors.isEmpty()) {
+            throw new PlatformApiDataValidationException("validation.msg.validation.errors.exist", "Validation errors exist.", errors);
+        }
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/serialization/InvestmentMasterCommandFromApiJsonDeserializer.java

@@ -0,0 +1,254 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.serialization;
+
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.ADDRESS1;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.ADDRESS2;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.ADDRESS3;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.BANK_TYPE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.BOND_TYPE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.BOND_TYPES;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.CITY;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.COMPANY_NAME;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.CORP_CODE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.CP_ACCOUNT_NO;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.CP_BANK_NAME;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.CP_BRANCH_NAME;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.CP_IFSC;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.DEBT_BOND_TYPES;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.EXPOSURE_LIMIT;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.FACE_VALUE_PER_UNIT;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.FAX;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.GL_ACCOUNT_ID;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.INT_RATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.ISIN;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.ISSUE_DATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.LEI_NO;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.MATURITY_DATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.PARTY_NAME;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.PARTY_PARAMS;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.PHONE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.PINCODE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.RBI_CODE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.RESOURCE_PARTY;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.RESOURCE_SCRIPT;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.SCRIPT_DESC;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.SCRIPT_PARAMS;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.SLR_TYPE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.SLR_TYPES;
+
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.infrastructure.core.data.ApiParameterError;
+import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
+import org.apache.fineract.infrastructure.core.exception.InvalidJsonException;
+import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
+import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
+import org.springframework.stereotype.Component;
+
+/** Validates Bank / Party Master and Script Master requests before anything is written. */
+@Component
+@RequiredArgsConstructor
+public final class InvestmentMasterCommandFromApiJsonDeserializer {
+
+    private static final String IFSC_PATTERN = "^[A-Z]{4}0[A-Z0-9]{6}$";
+    private static final String PINCODE_PATTERN = "^[0-9]{6}$";
+
+    private final FromJsonHelper fromApiJsonHelper;
+
+    // -------------------- Bank / Party Master --------------------
+
+    public void validateForCreateParty(final String json) {
+        validateParty(json, true);
+    }
+
+    public void validateForUpdateParty(final String json) {
+        validateParty(json, false);
+    }
+
+    private void validateParty(final String json, final boolean create) {
+        final JsonElement element = parse(json, PARTY_PARAMS);
+        final List<ApiParameterError> errors = new ArrayList<>();
+        final DataValidatorBuilder v = new DataValidatorBuilder(errors).resource(RESOURCE_PARTY);
+
+        validateBondType(element, v, create);
+        validateRequiredString(element, v, PARTY_NAME, 150, create);
+        validateGlAccountId(element, v, create);
+        validateAddress(element, v);
+        validateOptionalString(element, v, BANK_TYPE, 60);
+        validateOptionalString(element, v, RBI_CODE, 30);
+        validateOptionalString(element, v, LEI_NO, 30);
+        validateOptionalString(element, v, CP_BANK_NAME, 150);
+        validateOptionalString(element, v, CP_BRANCH_NAME, 150);
+        validateOptionalString(element, v, CP_ACCOUNT_NO, 40);
+
+        final String ifsc = this.fromApiJsonHelper.extractStringNamed(CP_IFSC, element);
+        if (StringUtils.isNotBlank(ifsc)) {
+            v.reset().parameter(CP_IFSC).value(ifsc.trim().toUpperCase()).matchesRegularExpression(IFSC_PATTERN,
+                    "IFSC must be 11 characters: 4 letters, 0, then 6 letters/digits");
+        }
+
+        if (this.fromApiJsonHelper.parameterExists(EXPOSURE_LIMIT, element)) {
+            final BigDecimal limit = this.fromApiJsonHelper.extractBigDecimalWithLocaleNamed(EXPOSURE_LIMIT, element);
+            v.reset().parameter(EXPOSURE_LIMIT).value(limit).ignoreIfNull().zeroOrPositiveAmount();
+        }
+        throwIfErrors(errors);
+    }
+
+    // -------------------- Script Master --------------------
+
+    public void validateForCreateScript(final String json) {
+        validateScript(json, true);
+    }
+
+    public void validateForUpdateScript(final String json, final String existingBondType) {
+        validateScript(json, false, existingBondType);
+    }
+
+    private void validateScript(final String json, final boolean create) {
+        validateScript(json, create, null);
+    }
+
+    private void validateScript(final String json, final boolean create, final String existingBondType) {
+        final JsonElement element = parse(json, SCRIPT_PARAMS);
+        final List<ApiParameterError> errors = new ArrayList<>();
+        final DataValidatorBuilder v = new DataValidatorBuilder(errors).resource(RESOURCE_SCRIPT);
+
+        validateBondType(element, v, create);
+        validateRequiredString(element, v, SCRIPT_DESC, 150, create);
+        validateGlAccountId(element, v, create);
+
+        final String slrType = this.fromApiJsonHelper.extractStringNamed(SLR_TYPE, element);
+        if (StringUtils.isNotBlank(slrType)) {
+            v.reset().parameter(SLR_TYPE).value(slrType).isOneOfTheseValues(SLR_TYPES.toArray());
+        }
+
+        final String bondType = create ? this.fromApiJsonHelper.extractStringNamed(BOND_TYPE, element) : existingBondType;
+        final boolean debt = bondType != null && DEBT_BOND_TYPES.contains(bondType);
+
+        final String isin = this.fromApiJsonHelper.extractStringNamed(ISIN, element);
+        if (create && debt) {
+            v.reset().parameter(ISIN).value(isin).notBlank();
+        }
+        v.reset().parameter(ISIN).value(isin).ignoreIfNull().notExceedingLengthOf(20);
+
+        if (this.fromApiJsonHelper.parameterExists(INT_RATE, element) || (create && debt)) {
+            final BigDecimal intRate = this.fromApiJsonHelper.extractBigDecimalWithLocaleNamed(INT_RATE, element);
+            final DataValidatorBuilder rate = v.reset().parameter(INT_RATE).value(intRate);
+            if (create && debt) {
+                rate.notNull();
+            }
+            rate.ignoreIfNull().zeroOrPositiveAmount();
+        }
+
+        if (this.fromApiJsonHelper.parameterExists(FACE_VALUE_PER_UNIT, element)) {
+            final BigDecimal fv = this.fromApiJsonHelper.extractBigDecimalWithLocaleNamed(FACE_VALUE_PER_UNIT, element);
+            v.reset().parameter(FACE_VALUE_PER_UNIT).value(fv).ignoreIfNull().positiveAmount();
+        }
+
+        LocalDate issueDate = null;
+        if (this.fromApiJsonHelper.parameterExists(ISSUE_DATE, element) || (create && debt)) {
+            issueDate = this.fromApiJsonHelper.extractLocalDateNamed(ISSUE_DATE, element);
+            if (create && debt) {
+                v.reset().parameter(ISSUE_DATE).value(issueDate).notNull();
+            }
+        }
+        if (this.fromApiJsonHelper.parameterExists(MATURITY_DATE, element)) {
+            final LocalDate maturityDate = this.fromApiJsonHelper.extractLocalDateNamed(MATURITY_DATE, element);
+            v.reset().parameter(MATURITY_DATE).value(maturityDate).ignoreIfNull().validateDateAfter(issueDate);
+        }
+
+        validateOptionalString(element, v, COMPANY_NAME, 150);
+        validateOptionalString(element, v, CORP_CODE, 30);
+        validateAddress(element, v);
+        throwIfErrors(errors);
+    }
+
+    // -------------------- shared --------------------
+
+    private void validateBondType(final JsonElement element, final DataValidatorBuilder v, final boolean required) {
+        final String bondType = this.fromApiJsonHelper.extractStringNamed(BOND_TYPE, element);
+        if (required) {
+            v.reset().parameter(BOND_TYPE).value(bondType).notBlank();
+        }
+        if (StringUtils.isNotBlank(bondType)) {
+            v.reset().parameter(BOND_TYPE).value(bondType).isOneOfTheseValues(BOND_TYPES.toArray());
+        }
+    }
+
+    private void validateGlAccountId(final JsonElement element, final DataValidatorBuilder v, final boolean required) {
+        if (!required && !this.fromApiJsonHelper.parameterExists(GL_ACCOUNT_ID, element)) {
+            return;
+        }
+        final Long glAccountId = this.fromApiJsonHelper.extractLongNamed(GL_ACCOUNT_ID, element);
+        v.reset().parameter(GL_ACCOUNT_ID).value(glAccountId).notNull().longGreaterThanZero();
+    }
+
+    private void validateRequiredString(final JsonElement element, final DataValidatorBuilder v, final String param, final int maxLength,
+            final boolean required) {
+        if (!required && !this.fromApiJsonHelper.parameterExists(param, element)) {
+            return;
+        }
+        final String value = this.fromApiJsonHelper.extractStringNamed(param, element);
+        v.reset().parameter(param).value(value).notBlank().notExceedingLengthOf(maxLength);
+    }
+
+    private void validateOptionalString(final JsonElement element, final DataValidatorBuilder v, final String param,
+            final int maxLength) {
+        final String value = this.fromApiJsonHelper.extractStringNamed(param, element);
+        v.reset().parameter(param).value(value).ignoreIfNull().notExceedingLengthOf(maxLength);
+    }
+
+    private void validateAddress(final JsonElement element, final DataValidatorBuilder v) {
+        validateOptionalString(element, v, ADDRESS1, 150);
+        validateOptionalString(element, v, ADDRESS2, 150);
+        validateOptionalString(element, v, ADDRESS3, 150);
+        validateOptionalString(element, v, CITY, 100);
+        validateOptionalString(element, v, PHONE, 20);
+        validateOptionalString(element, v, FAX, 20);
+        final String pincode = this.fromApiJsonHelper.extractStringNamed(PINCODE, element);
+        if (StringUtils.isNotBlank(pincode)) {
+            v.reset().parameter(PINCODE).value(pincode.trim()).matchesRegularExpression(PINCODE_PATTERN, "Pincode must be 6 digits");
+        }
+    }
+
+    private JsonElement parse(final String json, final Set<String> supportedParams) {
+        if (StringUtils.isBlank(json)) {
+            throw new InvalidJsonException();
+        }
+        final Type typeOfMap = new TypeToken<Map<String, Object>>() {}.getType();
+        this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, supportedParams);
+        return this.fromApiJsonHelper.parse(json);
+    }
+
+    private void throwIfErrors(final List<ApiParameterError> errors) {
+        if (!errors.isEmpty()) {
+            throw new PlatformApiDataValidationException("validation.msg.validation.errors.exist", "Validation errors exist.", errors);
+        }
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/serialization/InvestmentPurchaseCommandFromApiJsonDeserializer.java

@@ -0,0 +1,142 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.serialization;
+
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.BOND_TYPE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.BROKERAGE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.CATEGORIES;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.CATEGORY;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.CONSIDER_AMT;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.CR_GL_ACCOUNT_ID;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.DEAL_DATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.DEAL_TIME;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.FACE_VALUE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.LAST_INT_DATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.NAV;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.OTHER_CHARGES;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.OTHER_DETAILS;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.PARAMS;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.PARTY_ID;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.PURCHASE_RATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.RESOURCE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.SCRIPT_ID;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.SETTLEMENT_TYPE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.SETTLEMENT_TYPES;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.STAMP_DUTY;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.SUB_TYPE;
+
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.infrastructure.core.data.ApiParameterError;
+import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
+import org.apache.fineract.infrastructure.core.exception.InvalidJsonException;
+import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
+import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
+import org.apache.fineract.portfolio.investment.api.InvestmentApiConstants;
+import org.springframework.stereotype.Component;
+
+/** Validates a Purchase Entry before anything is computed or written. */
+@Component
+@RequiredArgsConstructor
+public final class InvestmentPurchaseCommandFromApiJsonDeserializer {
+
+    private static final String TIME_PATTERN = "^([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]$";
+
+    private final FromJsonHelper fromApiJsonHelper;
+
+    public void validateForCreate(final String json) {
+        if (StringUtils.isBlank(json)) {
+            throw new InvalidJsonException();
+        }
+        final Type typeOfMap = new TypeToken<Map<String, Object>>() {}.getType();
+        this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, PARAMS);
+        final JsonElement element = this.fromApiJsonHelper.parse(json);
+
+        final List<ApiParameterError> errors = new ArrayList<>();
+        final DataValidatorBuilder v = new DataValidatorBuilder(errors).resource(RESOURCE);
+
+        final String bondType = this.fromApiJsonHelper.extractStringNamed(BOND_TYPE, element);
+        v.reset().parameter(BOND_TYPE).value(bondType).notBlank();
+        if (StringUtils.isNotBlank(bondType)) {
+            v.reset().parameter(BOND_TYPE).value(bondType).isOneOfTheseValues(InvestmentApiConstants.BOND_TYPES.toArray());
+        }
+        v.reset().parameter(SCRIPT_ID).value(this.fromApiJsonHelper.extractLongNamed(SCRIPT_ID, element)).notNull().longGreaterThanZero();
+        v.reset().parameter(PARTY_ID).value(this.fromApiJsonHelper.extractLongNamed(PARTY_ID, element)).notNull().longGreaterThanZero();
+        v.reset().parameter(CR_GL_ACCOUNT_ID).value(this.fromApiJsonHelper.extractLongNamed(CR_GL_ACCOUNT_ID, element)).notNull()
+                .longGreaterThanZero();
+        v.reset().parameter(DEAL_DATE).value(this.fromApiJsonHelper.extractLocalDateNamed(DEAL_DATE, element)).notNull();
+
+        final String settlementType = this.fromApiJsonHelper.extractStringNamed(SETTLEMENT_TYPE, element);
+        v.reset().parameter(SETTLEMENT_TYPE).value(settlementType).notBlank();
+        if (StringUtils.isNotBlank(settlementType)) {
+            v.reset().parameter(SETTLEMENT_TYPE).value(settlementType).isOneOfTheseValues(SETTLEMENT_TYPES.toArray());
+        }
+
+        final String category = this.fromApiJsonHelper.extractStringNamed(CATEGORY, element);
+        v.reset().parameter(CATEGORY).value(category).notBlank();
+        if (StringUtils.isNotBlank(category)) {
+            v.reset().parameter(CATEGORY).value(category).isOneOfTheseValues(CATEGORIES.toArray());
+        }
+
+        if ("MUTUAL_FUND".equals(bondType)) {
+            v.reset().parameter(CONSIDER_AMT).value(amount(CONSIDER_AMT, element)).notNull().positiveAmount();
+            v.reset().parameter(NAV).value(amount(NAV, element)).notNull().positiveAmount();
+        } else {
+            v.reset().parameter(FACE_VALUE).value(amount(FACE_VALUE, element)).notNull().positiveAmount();
+            v.reset().parameter(PURCHASE_RATE).value(amount(PURCHASE_RATE, element)).notNull().positiveAmount();
+            v.reset().parameter(LAST_INT_DATE).value(this.fromApiJsonHelper.extractLocalDateNamed(LAST_INT_DATE, element)).notNull();
+        }
+        v.reset().parameter(BROKERAGE).value(amount(BROKERAGE, element)).ignoreIfNull().zeroOrPositiveAmount();
+        v.reset().parameter(STAMP_DUTY).value(amount(STAMP_DUTY, element)).ignoreIfNull().zeroOrPositiveAmount();
+        v.reset().parameter(OTHER_CHARGES).value(amount(OTHER_CHARGES, element)).ignoreIfNull().zeroOrPositiveAmount();
+
+        final String dealTime = this.fromApiJsonHelper.extractStringNamed(DEAL_TIME, element);
+        if (StringUtils.isNotBlank(dealTime)) {
+            v.reset().parameter(DEAL_TIME).value(dealTime).matchesRegularExpression(TIME_PATTERN, "Deal Time must be HH:mm:ss (24 hr)");
+        }
+        v.reset().parameter(SUB_TYPE).value(this.fromApiJsonHelper.extractStringNamed(SUB_TYPE, element)).ignoreIfNull()
+                .notExceedingLengthOf(40);
+
+        if (this.fromApiJsonHelper.parameterExists(OTHER_DETAILS, element)) {
+            final JsonElement other = element.getAsJsonObject().get(OTHER_DETAILS);
+            if (!other.isJsonNull() && !other.isJsonObject()) {
+                v.reset().parameter(OTHER_DETAILS).failWithCode("must.be.an.object");
+            } else if (other.isJsonObject() && other.toString().length() > 4000) {
+                v.reset().parameter(OTHER_DETAILS).failWithCode("too.long");
+            }
+        }
+
+        if (!errors.isEmpty()) {
+            throw new PlatformApiDataValidationException("validation.msg.validation.errors.exist", "Validation errors exist.", errors);
+        }
+    }
+
+    private BigDecimal amount(final String param, final JsonElement element) {
+        return this.fromApiJsonHelper.parameterExists(param, element)
+                ? this.fromApiJsonHelper.extractBigDecimalWithLocaleNamed(param, element)
+                : null;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentDailyRateReadPlatformService.java

@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import java.time.LocalDate;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.portfolio.investment.data.InvestmentDailyRateData;
+import org.apache.fineract.portfolio.investment.domain.InvestmentDailyRateRepository;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class InvestmentDailyRateReadPlatformService {
+
+    /** The register shows the latest rates first; older ones are reached by picking a script. */
+    private static final int MAX_ROWS = 500;
+
+    private final InvestmentDailyRateRepository dailyRateRepository;
+
+    public List<InvestmentDailyRateData> retrieveAll(final Long scriptId) {
+        if (scriptId != null) {
+            return this.dailyRateRepository.findByScriptIdOrderByRateDateDesc(scriptId).stream().map(InvestmentDailyRateData::from)
+                    .toList();
+        }
+        return this.dailyRateRepository
+                .findAll(PageRequest.of(0, MAX_ROWS, Sort.by(Sort.Direction.DESC, "rateDate").and(Sort.by(Sort.Direction.DESC, "id"))))
+                .stream().map(InvestmentDailyRateData::from).toList();
+    }
+
+    /** The newest rate of a script on or before {@code onDate}; null when none has been entered. */
+    public InvestmentDailyRateData retrieveLatest(final Long scriptId, final LocalDate onDate) {
+        return this.dailyRateRepository.findFirstByScriptIdAndRateDateLessThanEqualOrderByRateDateDesc(scriptId, onDate)
+                .map(InvestmentDailyRateData::from).orElse(null);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentDailyRateWritePlatformService.java

@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+
+public interface InvestmentDailyRateWritePlatformService {
+
+    CommandProcessingResult createDailyRate(JsonCommand command);
+
+    CommandProcessingResult deleteDailyRate(Long rateId);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentDailyRateWritePlatformServiceImpl.java

@@ -0,0 +1,87 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.CLOSE_RATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.HIGH_RATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.LOW_RATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.OPEN_RATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.RATE_DATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentDailyRateApiConstants.SCRIPT_ID;
+
+import java.time.LocalDate;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
+import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException;
+import org.apache.fineract.portfolio.investment.domain.InvestmentDailyRate;
+import org.apache.fineract.portfolio.investment.domain.InvestmentDailyRateRepository;
+import org.apache.fineract.portfolio.investment.domain.InvestmentScript;
+import org.apache.fineract.portfolio.investment.domain.InvestmentScriptRepository;
+import org.apache.fineract.portfolio.investment.exception.InvestmentDailyRateNotFoundException;
+import org.apache.fineract.portfolio.investment.exception.InvestmentScriptNotFoundException;
+import org.apache.fineract.portfolio.investment.serialization.InvestmentDailyRateCommandFromApiJsonDeserializer;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/** Saves and drops Daily Script Master rates. A wrong rate is corrected by dropping it and entering it again. */
+@Service
+@RequiredArgsConstructor
+public class InvestmentDailyRateWritePlatformServiceImpl implements InvestmentDailyRateWritePlatformService {
+
+    private final InvestmentDailyRateCommandFromApiJsonDeserializer validator;
+    private final InvestmentDailyRateRepository dailyRateRepository;
+    private final InvestmentScriptRepository scriptRepository;
+
+    @Override
+    @Transactional
+    public CommandProcessingResult createDailyRate(final JsonCommand command) {
+        this.validator.validateForCreate(command.json());
+        final Long scriptId = command.longValueOfParameterNamed(SCRIPT_ID);
+        final InvestmentScript script = this.scriptRepository.findById(scriptId)
+                .orElseThrow(() -> new InvestmentScriptNotFoundException(scriptId));
+        final LocalDate rateDate = command.localDateValueOfParameterNamed(RATE_DATE);
+        if (this.dailyRateRepository.existsByScriptIdAndRateDate(scriptId, rateDate)) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investmentdailyrate.duplicate",
+                    "A rate for " + script.getScriptCode() + " on this date already exists. Drop it first to correct it.");
+        }
+
+        final InvestmentDailyRate rate = new InvestmentDailyRate();
+        rate.setScript(script);
+        rate.setRateDate(rateDate);
+        rate.setOpenRate(command.bigDecimalValueOfParameterNamed(OPEN_RATE));
+        rate.setHighRate(command.bigDecimalValueOfParameterNamed(HIGH_RATE));
+        rate.setLowRate(command.bigDecimalValueOfParameterNamed(LOW_RATE));
+        rate.setCloseRate(command.bigDecimalValueOfParameterNamed(CLOSE_RATE));
+        final InvestmentDailyRate saved = this.dailyRateRepository.saveAndFlush(rate);
+        return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(saved.getId())
+                .withResourceIdAsString(script.getScriptCode()).build();
+    }
+
+    @Override
+    @Transactional
+    public CommandProcessingResult deleteDailyRate(final Long rateId) {
+        final InvestmentDailyRate rate = this.dailyRateRepository.findById(rateId)
+                .orElseThrow(() -> new InvestmentDailyRateNotFoundException(rateId));
+        this.dailyRateRepository.delete(rate);
+        this.dailyRateRepository.flush();
+        return new CommandProcessingResultBuilder().withEntityId(rateId).build();
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentInterestCalculator.java

@@ -0,0 +1,169 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.Month;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeSet;
+
+/**
+ * Interest arithmetic for half-yearly coupon securities, as the bank's existing CBS does it (Jitendra Sir):
+ * <ul>
+ * <li>days are counted 30/360 — every month is 30 days, a half-year is 180, a year 360;</li>
+ * <li>the coupon is fixed: face value × rate ÷ 2, paid on the maturity day/month and six months either side;</li>
+ * <li>at each closing (31 March, 30 September) the interest earned since the last coupon is booked as a provision (Dr
+ * Interest Receivable / Cr Interest Income), even though the cash arrives at the next coupon;</li>
+ * <li>when the coupon arrives, the provision already booked is cleared and only the rest is new income.</li>
+ * </ul>
+ * Broken-period interest paid to the seller at purchase is an expense of its own (RBI UCB Investment Directions, para
+ * 152; GL 500606), so it is not carried here: the first coupon is income in full.
+ */
+public final class InvestmentInterestCalculator {
+
+    private static final BigDecimal THIRTY_SIX_THOUSAND = BigDecimal.valueOf(36000);
+    private static final BigDecimal TWO_HUNDRED = BigDecimal.valueOf(200);
+
+    public static final String TYPE_PROVISION = "PROVISION";
+    public static final String TYPE_COUPON = "COUPON";
+
+    private InvestmentInterestCalculator() {}
+
+    /** One line of the interest schedule. */
+    public record ScheduleRow(String type, LocalDate date, LocalDate fromDate, LocalDate toDate, int days, BigDecimal grossInterest,
+            BigDecimal alreadyBooked, BigDecimal amount) {
+    }
+
+    /**
+     * Days between two dates on a 30/360 basis. Counting runs from the day after {@code from} up to and including
+     * {@code to}: 10-08 → 30-09 is 50 days, 10-08 → 08-10 is 58 days, 30-06 → 30-09 is 90 days.
+     */
+    public static int days360(final LocalDate from, final LocalDate to) {
+        if (from == null || to == null || !to.isAfter(from)) {
+            return 0;
+        }
+        final int d1 = Math.min(from.getDayOfMonth(), 30);
+        final int d2 = Math.min(to.getDayOfMonth(), 30);
+        return (to.getYear() - from.getYear()) * 360 + (to.getMonthValue() - from.getMonthValue()) * 30 + (d2 - d1);
+    }
+
+    /** Interest on {@code faceValue} at {@code ratePercent} p.a. for {@code days} (30/360), rounded to the rupee. */
+    public static BigDecimal interestForDays(final BigDecimal faceValue, final BigDecimal ratePercent, final int days) {
+        return faceValue.multiply(ratePercent).multiply(BigDecimal.valueOf(days)).divide(THIRTY_SIX_THOUSAND, 0, RoundingMode.HALF_UP);
+    }
+
+    /** The fixed half-yearly coupon: face value × rate ÷ 2. */
+    public static BigDecimal halfYearCoupon(final BigDecimal faceValue, final BigDecimal ratePercent) {
+        return faceValue.multiply(ratePercent).divide(TWO_HUNDRED, 0, RoundingMode.HALF_UP);
+    }
+
+    /** k-th coupon date counting back from maturity — measured from maturity each time so month-end days survive. */
+    private static LocalDate couponBack(final LocalDate maturity, final int k) {
+        return maturity.minusMonths(6L * k);
+    }
+
+    /** The most recent coupon date on or before {@code on}. */
+    public static LocalDate lastCouponOnOrBefore(final LocalDate maturity, final LocalDate on) {
+        int k = 0;
+        LocalDate d = maturity;
+        while (d.isAfter(on)) {
+            k++;
+            d = couponBack(maturity, k);
+        }
+        return d;
+    }
+
+    /** Coupon dates strictly after {@code from}, up to and including maturity, in date order. */
+    public static List<LocalDate> couponDatesAfter(final LocalDate maturity, final LocalDate from) {
+        final List<LocalDate> dates = new ArrayList<>();
+        int k = 0;
+        LocalDate d = maturity;
+        while (d.isAfter(from)) {
+            dates.add(0, d);
+            k++;
+            d = couponBack(maturity, k);
+        }
+        return dates;
+    }
+
+    /** Closing dates (31 March, 30 September) from {@code from} up to {@code to}, inclusive. */
+    public static List<LocalDate> closingDates(final LocalDate from, final LocalDate to) {
+        final List<LocalDate> dates = new ArrayList<>();
+        for (int year = from.getYear(); year <= to.getYear(); year++) {
+            for (final LocalDate closing : List.of(LocalDate.of(year, Month.MARCH, 31), LocalDate.of(year, Month.SEPTEMBER, 30))) {
+                if (!closing.isBefore(from) && !closing.isAfter(to)) {
+                    dates.add(closing);
+                }
+            }
+        }
+        return dates;
+    }
+
+    /**
+     * The full interest schedule of a holding, from purchase to maturity.
+     *
+     * @param faceValue
+     *            face value currently held
+     * @param ratePercent
+     *            coupon rate % p.a.
+     * @param maturity
+     *            maturity date (coupons fall on its day/month and six months either side)
+     * @param lastIntDate
+     *            coupon date immediately before the purchase
+     * @param dealDate
+     *            date the holding became ours (the purchase settlement date) — closings before it belong to the seller
+     */
+    public static List<ScheduleRow> schedule(final BigDecimal faceValue, final BigDecimal ratePercent, final LocalDate maturity,
+            final LocalDate lastIntDate, final LocalDate dealDate) {
+        final List<ScheduleRow> rows = new ArrayList<>();
+        if (faceValue == null || ratePercent == null || ratePercent.signum() <= 0 || maturity == null || lastIntDate == null
+                || dealDate == null || !maturity.isAfter(lastIntDate)) {
+            return rows;
+        }
+        final List<LocalDate> coupons = couponDatesAfter(maturity, lastIntDate);
+        final TreeSet<LocalDate> events = new TreeSet<>(coupons);
+        for (final LocalDate closing : closingDates(dealDate, maturity)) {
+            if (closing.isAfter(lastIntDate) && !events.contains(closing)) {
+                events.add(closing);
+            }
+        }
+
+        final BigDecimal coupon = halfYearCoupon(faceValue, ratePercent);
+        BigDecimal receivable = BigDecimal.ZERO;
+        LocalDate previousCoupon = lastIntDate;
+        for (final LocalDate date : events) {
+            final int days = days360(previousCoupon, date);
+            if (coupons.contains(date)) {
+                rows.add(new ScheduleRow(TYPE_COUPON, date, previousCoupon.plusDays(1), date, days, coupon, receivable,
+                        coupon.subtract(receivable)));
+                receivable = BigDecimal.ZERO;
+                previousCoupon = date;
+            } else {
+                final BigDecimal earned = interestForDays(faceValue, ratePercent, days);
+                rows.add(new ScheduleRow(TYPE_PROVISION, date, previousCoupon.plusDays(1), date, days, earned, receivable,
+                        earned.subtract(receivable)));
+                receivable = earned;
+            }
+        }
+        return rows;
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentInterestPostingWritePlatformService.java

@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+
+public interface InvestmentInterestPostingWritePlatformService {
+
+    CommandProcessingResult postInterest(Long purchaseId, JsonCommand command);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentInterestPostingWritePlatformServiceImpl.java

@@ -0,0 +1,145 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import static org.apache.fineract.portfolio.investment.api.InvestmentInterestApiConstants.BANK_GL_ACCOUNT_ID;
+import static org.apache.fineract.portfolio.investment.api.InvestmentInterestApiConstants.INTEREST_RECEIVABLE_GL_CODE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentInterestApiConstants.INT_DATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentInterestApiConstants.LINE_TYPE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.STATUS_ACTIVE;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.accounting.glaccount.domain.GLAccountRepositoryWrapper;
+import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
+import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.portfolio.investment.api.InvestmentInterestApiConstants;
+import org.apache.fineract.portfolio.investment.domain.InvestmentInterestPosting;
+import org.apache.fineract.portfolio.investment.domain.InvestmentInterestPostingRepository;
+import org.apache.fineract.portfolio.investment.domain.InvestmentPurchase;
+import org.apache.fineract.portfolio.investment.domain.InvestmentPurchaseRepository;
+import org.apache.fineract.portfolio.investment.exception.InvestmentPurchaseNotFoundException;
+import org.apache.fineract.portfolio.investment.serialization.InvestmentInterestCommandFromApiJsonDeserializer;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Posts one interest schedule line of a holding to GL with its JV voucher, on or after its date and in date order:
+ * <ul>
+ * <li>provision (31 March / 30 September): Dr Interest Receivable / Cr Interest Income;</li>
+ * <li>coupon: Dr Bank (full coupon) / Cr Interest Receivable (what the provision booked) / Cr Interest Income (the
+ * rest).</li>
+ * </ul>
+ * The amounts come from the schedule, never from the request, so the voucher always matches what the screen shows.
+ */
+@Service
+@RequiredArgsConstructor
+public class InvestmentInterestPostingWritePlatformServiceImpl implements InvestmentInterestPostingWritePlatformService {
+
+    private static final DateTimeFormatter DATE = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+
+    private final InvestmentInterestCommandFromApiJsonDeserializer validator;
+    private final InvestmentPurchaseRepository purchaseRepository;
+    private final InvestmentInterestPostingRepository postingRepository;
+    private final InvestmentPurchaseReadPlatformService readPlatformService;
+    private final InvestmentJournalPoster journalPoster;
+    private final GLAccountRepositoryWrapper glAccountRepository;
+
+    @Override
+    @Transactional
+    public CommandProcessingResult postInterest(final Long purchaseId, final JsonCommand command) {
+        this.validator.validateForPost(command.json());
+        final InvestmentPurchase p = this.purchaseRepository.findById(purchaseId)
+                .orElseThrow(() -> new InvestmentPurchaseNotFoundException(purchaseId));
+        if (!STATUS_ACTIVE.equals(p.getStatus())) {
+            throw rule("not.active", "Deal " + p.getDealNo() + " is not an active (settled) holding");
+        }
+        final String lineType = command.stringValueOfParameterNamed(LINE_TYPE);
+        final LocalDate intDate = command.localDateValueOfParameterNamed(INT_DATE);
+        if (intDate.isAfter(DateUtils.getBusinessLocalDate())) {
+            throw rule("before.date", "This interest line can be posted on or after " + intDate.format(DATE));
+        }
+
+        final List<InvestmentInterestPosting> posted = this.postingRepository.findByPurchaseIdOrderByIntDateAsc(purchaseId);
+        final InvestmentInterestCalculator.ScheduleRow next = this.readPlatformService.scheduleRows(p).stream()
+                .filter(r -> posted.stream().noneMatch(x -> x.getLineType().equals(r.type()) && x.getIntDate().equals(r.date())))
+                .findFirst().orElseThrow(() -> rule("all.posted", "All interest lines of deal " + p.getDealNo() + " are already posted"));
+        if (!next.type().equals(lineType) || !next.date().equals(intDate)) {
+            throw rule("out.of.order", "Post the interest lines in date order: next for deal " + p.getDealNo() + " is the "
+                    + next.type().toLowerCase() + " of " + next.date().format(DATE));
+        }
+
+        final Long receivableGl = this.journalPoster.glId(INTEREST_RECEIVABLE_GL_CODE);
+        final Long incomeGl = this.journalPoster.glId(InvestmentInterestApiConstants.interestIncomeGlCode(p.getBondType()));
+        final InvestmentJournalPoster.Lines lines = new InvestmentJournalPoster.Lines();
+        GLAccount bankGl = null;
+        if (InvestmentInterestCalculator.TYPE_COUPON.equals(lineType)) {
+            bankGl = command.parameterExists(BANK_GL_ACCOUNT_ID) && command.longValueOfParameterNamed(BANK_GL_ACCOUNT_ID) != null
+                    ? postableAssetGl(command.longValueOfParameterNamed(BANK_GL_ACCOUNT_ID))
+                    : p.getCrGlAccount();
+            lines.debit(bankGl.getId(), next.grossInterest()).credit(receivableGl, next.alreadyBooked()).credit(incomeGl, next.amount());
+        } else {
+            lines.debit(receivableGl, next.amount()).credit(incomeGl, next.amount());
+        }
+        final String what = InvestmentInterestCalculator.TYPE_COUPON.equals(lineType) ? "Coupon received" : "Interest provision";
+        final CommandProcessingResult result = this.journalPoster.post(intDate, p.getDealNo(), what + " " + intDate.format(DATE) + ": deal "
+                + p.getDealNo() + ", " + p.getScript().getScriptCode() + " " + p.getScript().getScriptDesc(), lines);
+
+        final InvestmentInterestPosting posting = new InvestmentInterestPosting();
+        posting.setPurchase(p);
+        posting.setLineType(lineType);
+        posting.setIntDate(intDate);
+        posting.setFromDate(next.fromDate());
+        posting.setToDate(next.toDate());
+        posting.setDays(next.days());
+        posting.setGrossInterest(next.grossInterest());
+        posting.setAlreadyBooked(next.alreadyBooked());
+        posting.setAmount(next.amount());
+        posting.setBankGlAccount(bankGl);
+        posting.setGlTransactionId(result.getTransactionId());
+        final Object voucherNo = result.getChanges() == null ? null : result.getChanges().get("voucherNo");
+        posting.setVoucherNo(voucherNo == null ? null : voucherNo.toString());
+        posting.setPostedOnDate(DateUtils.getBusinessLocalDate());
+        final InvestmentInterestPosting saved = this.postingRepository.saveAndFlush(posting);
+
+        return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(saved.getId())
+                .withSubEntityId(purchaseId).withResourceIdAsString(posting.getVoucherNo()).withTransactionId(result.getTransactionId())
+                .build();
+    }
+
+    /** A bank the coupon is received into must be an enabled ASSET detail GL. */
+    private GLAccount postableAssetGl(final Long glAccountId) {
+        final GLAccount gl = this.glAccountRepository.findOneWithNotFoundDetection(glAccountId);
+        if (gl.isHeaderAccount() || gl.isDisabled() || !GLAccountType.ASSET.getValue().equals(gl.getType())) {
+            throw rule("bank.glaccount.invalid", "Bank GL " + gl.getGlCode() + " must be an enabled Asset detail account");
+        }
+        return gl;
+    }
+
+    private static GeneralPlatformDomainRuleException rule(final String code, final String message) {
+        return new GeneralPlatformDomainRuleException("error.msg.investmentinterest." + code, message);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentJournalPoster.java

@@ -0,0 +1,105 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Locale;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.accounting.glaccount.domain.GLAccountRepositoryWrapper;
+import org.apache.fineract.accounting.journalentry.service.JournalEntryWritePlatformService;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ * Posts investment entries to GL through the journal entry command, like any manual entry: it checks the GLs and
+ * accounting closures, joins the caller's transaction (so under maker-checker nothing persists until approval) and
+ * raises the JV voucher. Investments are a Head Office function, so every entry is booked there, in INR.
+ */
+@Component
+@RequiredArgsConstructor
+public class InvestmentJournalPoster {
+
+    private static final String DATE_FORMAT = "dd MMMM yyyy";
+
+    private final JournalEntryWritePlatformService journalEntryWritePlatformService;
+    private final FromJsonHelper fromApiJsonHelper;
+    private final GLAccountRepositoryWrapper glAccountRepository;
+    private final JdbcTemplate jdbcTemplate;
+
+    /** Debit and credit lines of one entry; zero or missing amounts are left out. */
+    public static final class Lines {
+
+        private final JsonArray debits = new JsonArray();
+        private final JsonArray credits = new JsonArray();
+
+        public Lines debit(final Long glAccountId, final BigDecimal amount) {
+            add(this.debits, glAccountId, amount);
+            return this;
+        }
+
+        public Lines credit(final Long glAccountId, final BigDecimal amount) {
+            add(this.credits, glAccountId, amount);
+            return this;
+        }
+
+        private static void add(final JsonArray lines, final Long glAccountId, final BigDecimal amount) {
+            if (amount != null && amount.signum() > 0) {
+                final JsonObject line = new JsonObject();
+                line.addProperty("glAccountId", glAccountId);
+                line.addProperty("amount", amount);
+                lines.add(line);
+            }
+        }
+    }
+
+    public Long glId(final String glCode) {
+        return this.glAccountRepository.findOneByGlCodeWithNotFoundDetection(glCode).getId();
+    }
+
+    /**
+     * Posts the entry dated {@code date}; the result carries the GL transaction id and, in its changes, the voucherNo.
+     */
+    public CommandProcessingResult post(final LocalDate date, final String referenceNumber, final String comments, final Lines lines) {
+        final JsonObject payload = new JsonObject();
+        payload.addProperty("officeId", headOfficeId());
+        payload.addProperty("transactionDate", date.format(DateTimeFormatter.ofPattern(DATE_FORMAT, Locale.ENGLISH)));
+        payload.addProperty("dateFormat", DATE_FORMAT);
+        payload.addProperty("locale", "en");
+        payload.addProperty("currencyCode", "INR");
+        payload.addProperty("referenceNumber", referenceNumber);
+        payload.addProperty("comments", comments);
+        payload.add("debits", lines.debits);
+        payload.add("credits", lines.credits);
+        final String json = payload.toString();
+        final JsonCommand journalEntryCommand = JsonCommand.from(json, this.fromApiJsonHelper.parse(json), this.fromApiJsonHelper, null,
+                null, null, null, null, null, null, null, null, null, null, null, null, null);
+        return this.journalEntryWritePlatformService.createJournalEntry(journalEntryCommand);
+    }
+
+    private Long headOfficeId() {
+        return this.jdbcTemplate.queryForObject("SELECT id FROM m_office WHERE parent_id IS NULL ORDER BY id LIMIT 1", Long.class);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentMasterReadPlatformService.java

@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import java.util.List;
+import org.apache.fineract.portfolio.investment.data.InvestmentPartyData;
+import org.apache.fineract.portfolio.investment.data.InvestmentScriptData;
+
+public interface InvestmentMasterReadPlatformService {
+
+    List<InvestmentPartyData> retrieveAllParties();
+
+    InvestmentPartyData retrieveParty(Long partyId);
+
+    List<InvestmentScriptData> retrieveAllScripts();
+
+    InvestmentScriptData retrieveScript(Long scriptId);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentMasterReadPlatformServiceImpl.java

@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.portfolio.investment.data.InvestmentPartyData;
+import org.apache.fineract.portfolio.investment.data.InvestmentScriptData;
+import org.apache.fineract.portfolio.investment.domain.InvestmentPartyRepository;
+import org.apache.fineract.portfolio.investment.domain.InvestmentScriptRepository;
+import org.apache.fineract.portfolio.investment.exception.InvestmentPartyNotFoundException;
+import org.apache.fineract.portfolio.investment.exception.InvestmentScriptNotFoundException;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/** Masters are small (tens of rows), so they are listed whole, newest first, the way the screens show them. */
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class InvestmentMasterReadPlatformServiceImpl implements InvestmentMasterReadPlatformService {
+
+    private static final Sort NEWEST_FIRST = Sort.by(Sort.Direction.DESC, "id");
+
+    private final InvestmentPartyRepository partyRepository;
+    private final InvestmentScriptRepository scriptRepository;
+
+    @Override
+    public List<InvestmentPartyData> retrieveAllParties() {
+        return this.partyRepository.findAll(NEWEST_FIRST).stream().map(InvestmentPartyData::from).toList();
+    }
+
+    @Override
+    public InvestmentPartyData retrieveParty(final Long partyId) {
+        return this.partyRepository.findById(partyId).map(InvestmentPartyData::from)
+                .orElseThrow(() -> new InvestmentPartyNotFoundException(partyId));
+    }
+
+    @Override
+    public List<InvestmentScriptData> retrieveAllScripts() {
+        return this.scriptRepository.findAll(NEWEST_FIRST).stream().map(InvestmentScriptData::from).toList();
+    }
+
+    @Override
+    public InvestmentScriptData retrieveScript(final Long scriptId) {
+        return this.scriptRepository.findById(scriptId).map(InvestmentScriptData::from)
+                .orElseThrow(() -> new InvestmentScriptNotFoundException(scriptId));
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentMasterWritePlatformService.java

@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+
+public interface InvestmentMasterWritePlatformService {
+
+    CommandProcessingResult createParty(JsonCommand command);
+
+    CommandProcessingResult updateParty(Long partyId, JsonCommand command);
+
+    CommandProcessingResult deleteParty(Long partyId);
+
+    CommandProcessingResult createScript(JsonCommand command);
+
+    CommandProcessingResult updateScript(Long scriptId, JsonCommand command);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentMasterWritePlatformServiceImpl.java

@@ -0,0 +1,298 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.ACTIVE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.ADDRESS1;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.ADDRESS2;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.ADDRESS3;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.BANK_TYPE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.BOND_TYPE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.CITY;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.COMPANY_NAME;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.CORP_CODE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.CP_ACCOUNT_NO;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.CP_BANK_NAME;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.CP_BRANCH_NAME;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.CP_IFSC;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.EXPOSURE_LIMIT;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.FACE_VALUE_PER_UNIT;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.FAX;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.GL_ACCOUNT_ID;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.INT_RATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.ISIN;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.ISSUE_DATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.LEI_NO;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.MATURITY_DATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.PARTY_CODE_PREFIX;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.PARTY_NAME;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.PHONE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.PINCODE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.RBI_CODE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.SCRIPT_CODE_PREFIX;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.SCRIPT_DESC;
+import static org.apache.fineract.portfolio.investment.api.InvestmentApiConstants.SLR_TYPE;
+
+import java.math.BigDecimal;
+import java.util.function.Consumer;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.accounting.glaccount.domain.GLAccountRepositoryWrapper;
+import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
+import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException;
+import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
+import org.apache.fineract.portfolio.investment.domain.InvestmentParty;
+import org.apache.fineract.portfolio.investment.domain.InvestmentPartyRepository;
+import org.apache.fineract.portfolio.investment.domain.InvestmentScript;
+import org.apache.fineract.portfolio.investment.domain.InvestmentScriptRepository;
+import org.apache.fineract.portfolio.investment.exception.InvestmentPartyNotFoundException;
+import org.apache.fineract.portfolio.investment.exception.InvestmentScriptNotFoundException;
+import org.apache.fineract.portfolio.investment.serialization.InvestmentMasterCommandFromApiJsonDeserializer;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+public class InvestmentMasterWritePlatformServiceImpl implements InvestmentMasterWritePlatformService {
+
+    private final InvestmentMasterCommandFromApiJsonDeserializer validator;
+    private final InvestmentPartyRepository partyRepository;
+    private final InvestmentScriptRepository scriptRepository;
+    private final GLAccountRepositoryWrapper glAccountRepository;
+    private final JdbcTemplate jdbcTemplate;
+
+    // -------------------- Bank / Party Master --------------------
+
+    @Override
+    @Transactional
+    public CommandProcessingResult createParty(final JsonCommand command) {
+        this.validator.validateForCreateParty(command.json());
+        final InvestmentParty party = new InvestmentParty();
+        party.setPartyCode(nextPartyCode());
+        applyParty(party, command);
+        if (command.parameterExists(ACTIVE)) {
+            party.setActive(command.booleanPrimitiveValueOfParameterNamed(ACTIVE));
+        }
+        final InvestmentParty saved = saveParty(party);
+        return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(saved.getId())
+                .withResourceIdAsString(saved.getPartyCode()).build();
+    }
+
+    @Override
+    @Transactional
+    public CommandProcessingResult updateParty(final Long partyId, final JsonCommand command) {
+        this.validator.validateForUpdateParty(command.json());
+        final InvestmentParty party = this.partyRepository.findById(partyId).orElseThrow(() -> new InvestmentPartyNotFoundException(partyId));
+        applyParty(party, command);
+        if (command.parameterExists(ACTIVE)) {
+            party.setActive(command.booleanPrimitiveValueOfParameterNamed(ACTIVE));
+        }
+        saveParty(party);
+        return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(partyId)
+                .withResourceIdAsString(party.getPartyCode()).build();
+    }
+
+    @Override
+    @Transactional
+    public CommandProcessingResult deleteParty(final Long partyId) {
+        final InvestmentParty party = this.partyRepository.findById(partyId).orElseThrow(() -> new InvestmentPartyNotFoundException(partyId));
+        this.partyRepository.delete(party);
+        this.partyRepository.flush();
+        return new CommandProcessingResultBuilder().withEntityId(partyId).withResourceIdAsString(party.getPartyCode()).build();
+    }
+
+    /** Copies every party field present in the request onto the entity (absent fields are left unchanged). */
+    private void applyParty(final InvestmentParty p, final JsonCommand command) {
+        setIfPresent(command, BOND_TYPE, p::setBondType);
+        setIfPresent(command, PARTY_NAME, p::setPartyName);
+        setIfPresent(command, ADDRESS1, p::setAddress1);
+        setIfPresent(command, ADDRESS2, p::setAddress2);
+        setIfPresent(command, ADDRESS3, p::setAddress3);
+        setIfPresent(command, CITY, p::setCity);
+        setIfPresent(command, PINCODE, p::setPincode);
+        setIfPresent(command, PHONE, p::setPhone);
+        setIfPresent(command, FAX, p::setFax);
+        setIfPresent(command, BANK_TYPE, p::setBankType);
+        setIfPresent(command, RBI_CODE, p::setRbiCode);
+        setIfPresent(command, LEI_NO, p::setLeiNo);
+        setIfPresent(command, CP_BANK_NAME, p::setCpBankName);
+        setIfPresent(command, CP_BRANCH_NAME, p::setCpBranchName);
+        setIfPresent(command, CP_ACCOUNT_NO, p::setCpAccountNo);
+        if (command.parameterExists(CP_IFSC)) {
+            final String ifsc = command.stringValueOfParameterNamedAllowingNull(CP_IFSC);
+            p.setCpIfsc(StringUtils.isBlank(ifsc) ? null : ifsc.trim().toUpperCase());
+        }
+        if (command.parameterExists(EXPOSURE_LIMIT)) {
+            p.setExposureLimit(command.bigDecimalValueOfParameterNamed(EXPOSURE_LIMIT));
+        }
+        if (command.parameterExists(GL_ACCOUNT_ID)) {
+            p.setGlAccount(postableAssetGl(command.longValueOfParameterNamed(GL_ACCOUNT_ID)));
+        }
+    }
+
+    private InvestmentParty saveParty(final InvestmentParty party) {
+        try {
+            return this.partyRepository.saveAndFlush(party);
+        } catch (final DataIntegrityViolationException e) {
+            throw new PlatformDataIntegrityException("error.msg.investmentparty.duplicate", "A party with this code already exists",
+                    "partyCode", party.getPartyCode(), e);
+        }
+    }
+
+    /** Next code in the PTY-001, PTY-002 … series. */
+    private String nextPartyCode() {
+        final Integer max = this.jdbcTemplate.queryForObject(
+                "SELECT MAX(CAST(SUBSTRING(party_code FROM 5) AS INTEGER)) FROM m_investment_party WHERE party_code ~ '^PTY-[0-9]+$'",
+                Integer.class);
+        return PARTY_CODE_PREFIX + String.format("%03d", (max == null ? 0 : max) + 1);
+    }
+
+    // -------------------- Script Master --------------------
+
+    @Override
+    @Transactional
+    public CommandProcessingResult createScript(final JsonCommand command) {
+        this.validator.validateForCreateScript(command.json());
+        final InvestmentScript script = new InvestmentScript();
+        script.setBondType(command.stringValueOfParameterNamed(BOND_TYPE));
+        script.setScriptCode(nextScriptCode(script.getBondType()));
+        script.setFaceValuePerUnit(defaultFaceValue(script.getBondType()));
+        applyScript(script, command);
+        if (command.parameterExists(ACTIVE)) {
+            script.setActive(command.booleanPrimitiveValueOfParameterNamed(ACTIVE));
+        }
+        final InvestmentScript saved = saveScript(script);
+        return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(saved.getId())
+                .withResourceIdAsString(saved.getScriptCode()).build();
+    }
+
+    @Override
+    @Transactional
+    public CommandProcessingResult updateScript(final Long scriptId, final JsonCommand command) {
+        final InvestmentScript script = this.scriptRepository.findById(scriptId)
+                .orElseThrow(() -> new InvestmentScriptNotFoundException(scriptId));
+        this.validator.validateForUpdateScript(command.json(), script.getBondType());
+        if (command.parameterExists(BOND_TYPE) && !script.getBondType().equals(command.stringValueOfParameterNamed(BOND_TYPE))) {
+            // The script code carries the bond-type letter (G00001), so the type cannot change once created.
+            throw new GeneralPlatformDomainRuleException("error.msg.investmentscript.bondtype.immutable",
+                    "Bond Type of an existing script cannot be changed", script.getScriptCode());
+        }
+        applyScript(script, command);
+        if (command.parameterExists(ACTIVE)) {
+            script.setActive(command.booleanPrimitiveValueOfParameterNamed(ACTIVE));
+        }
+        saveScript(script);
+        return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(scriptId)
+                .withResourceIdAsString(script.getScriptCode()).build();
+    }
+
+    private void applyScript(final InvestmentScript s, final JsonCommand command) {
+        setIfPresent(command, SLR_TYPE, s::setSlrType);
+        setIfPresent(command, SCRIPT_DESC, s::setScriptDesc);
+        setIfPresent(command, ISIN, s::setIsin);
+        setIfPresent(command, COMPANY_NAME, s::setCompanyName);
+        setIfPresent(command, ADDRESS1, s::setAddress1);
+        setIfPresent(command, ADDRESS2, s::setAddress2);
+        setIfPresent(command, ADDRESS3, s::setAddress3);
+        setIfPresent(command, CITY, s::setCity);
+        setIfPresent(command, PINCODE, s::setPincode);
+        setIfPresent(command, PHONE, s::setPhone);
+        setIfPresent(command, FAX, s::setFax);
+        setIfPresent(command, CORP_CODE, s::setCorpCode);
+        if (command.parameterExists(FACE_VALUE_PER_UNIT) && command.bigDecimalValueOfParameterNamed(FACE_VALUE_PER_UNIT) != null) {
+            s.setFaceValuePerUnit(command.bigDecimalValueOfParameterNamed(FACE_VALUE_PER_UNIT));
+        }
+        if (command.parameterExists(INT_RATE)) {
+            s.setIntRate(command.bigDecimalValueOfParameterNamed(INT_RATE));
+        }
+        if (command.parameterExists(ISSUE_DATE)) {
+            s.setIssueDate(command.localDateValueOfParameterNamed(ISSUE_DATE));
+        }
+        if (command.parameterExists(MATURITY_DATE)) {
+            s.setMaturityDate(command.localDateValueOfParameterNamed(MATURITY_DATE));
+        }
+        if (s.getIssueDate() != null && s.getMaturityDate() != null && s.getMaturityDate().isBefore(s.getIssueDate())) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investmentscript.maturity.before.issue",
+                    "Maturity date cannot be before the issue date");
+        }
+        if (command.parameterExists(GL_ACCOUNT_ID)) {
+            s.setGlAccount(postableAssetGl(command.longValueOfParameterNamed(GL_ACCOUNT_ID)));
+        }
+    }
+
+    private InvestmentScript saveScript(final InvestmentScript script) {
+        try {
+            return this.scriptRepository.saveAndFlush(script);
+        } catch (final DataIntegrityViolationException e) {
+            throw new PlatformDataIntegrityException("error.msg.investmentscript.duplicate", "A script with this code already exists",
+                    "scriptCode", script.getScriptCode(), e);
+        }
+    }
+
+    /** Next code for the bond type — its letter plus a five-digit running number, e.g. G00001. */
+    private String nextScriptCode(final String bondType) {
+        final String prefix = SCRIPT_CODE_PREFIX.get(bondType);
+        final Integer max = this.jdbcTemplate.queryForObject(
+                "SELECT MAX(CAST(SUBSTRING(script_code FROM 2) AS INTEGER)) FROM m_investment_script WHERE script_code ~ ?",
+                Integer.class, "^" + prefix + "[0-9]{5}$");
+        return prefix + String.format("%05d", (max == null ? 0 : max) + 1);
+    }
+
+    /** Face value of one unit: ₹100 for securities and bonds, as the existing CBS defaults it. */
+    private BigDecimal defaultFaceValue(final String bondType) {
+        return switch (bondType) {
+            case "MUTUAL_FUND" -> BigDecimal.valueOf(1000);
+            case "SHARE", "FD" -> BigDecimal.ONE;
+            default -> BigDecimal.valueOf(100);
+        };
+    }
+
+    // -------------------- shared --------------------
+
+    /** An investment is an asset, so the mapped GL must be an enabled ASSET detail account. */
+    private GLAccount postableAssetGl(final Long glAccountId) {
+        final GLAccount gl = this.glAccountRepository.findOneWithNotFoundDetection(glAccountId);
+        if (gl.isHeaderAccount()) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investment.glaccount.header",
+                    "GL " + gl.getGlCode() + " is a header account; choose a detail account", glAccountId);
+        }
+        if (gl.isDisabled()) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investment.glaccount.disabled", "GL " + gl.getGlCode() + " is disabled",
+                    glAccountId);
+        }
+        if (!GLAccountType.ASSET.getValue().equals(gl.getType())) {
+            throw new GeneralPlatformDomainRuleException("error.msg.investment.glaccount.not.asset",
+                    "GL " + gl.getGlCode() + " is not an Asset account", glAccountId);
+        }
+        return gl;
+    }
+
+    private static void setIfPresent(final JsonCommand command, final String param, final Consumer<String> setter) {
+        if (command.parameterExists(param)) {
+            final String value = command.stringValueOfParameterNamedAllowingNull(param);
+            setter.accept(StringUtils.isBlank(value) ? null : value.trim());
+        }
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentPurchaseReadPlatformService.java

@@ -0,0 +1,155 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.accounting.glaccount.domain.GLAccountRepositoryWrapper;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.portfolio.investment.api.InvestmentInterestApiConstants;
+import org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants;
+import org.apache.fineract.portfolio.investment.data.InvestmentInterestDueData;
+import org.apache.fineract.portfolio.investment.data.InvestmentInterestScheduleData;
+import org.apache.fineract.portfolio.investment.data.InvestmentPurchaseData;
+import org.apache.fineract.portfolio.investment.domain.InvestmentInterestPosting;
+import org.apache.fineract.portfolio.investment.domain.InvestmentInterestPostingRepository;
+import org.apache.fineract.portfolio.investment.domain.InvestmentPurchase;
+import org.apache.fineract.portfolio.investment.domain.InvestmentPurchaseRepository;
+import org.apache.fineract.portfolio.investment.exception.InvestmentPurchaseNotFoundException;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class InvestmentPurchaseReadPlatformService {
+
+    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+
+    private final InvestmentPurchaseRepository purchaseRepository;
+    private final InvestmentInterestPostingRepository postingRepository;
+    private final GLAccountRepositoryWrapper glAccountRepository;
+
+    /** All deals, newest first — the Holdings register. */
+    public List<InvestmentPurchaseData> retrieveAll() {
+        return this.purchaseRepository.findAll(Sort.by(Sort.Direction.DESC, "id")).stream().map(InvestmentPurchaseData::from).toList();
+    }
+
+    public InvestmentPurchaseData retrieveOne(final Long purchaseId) {
+        return InvestmentPurchaseData.from(find(purchaseId));
+    }
+
+    /**
+     * Coupon and closing-provision lines of a holding from purchase to maturity, worked out on the face value still
+     * held, with what has been posted. Lines on or before {@code asOnDate} (default: business date) are marked due; the
+     * next unposted line is postable once its date has come, and shows as due soon from {@code DUE_WITHIN_DAYS} before.
+     */
+    public InvestmentInterestScheduleData retrieveInterestSchedule(final Long purchaseId, final LocalDate asOnDate) {
+        final InvestmentPurchase p = find(purchaseId);
+        final LocalDate today = DateUtils.getBusinessLocalDate();
+        final LocalDate asOn = asOnDate == null ? today : asOnDate;
+        final BigDecimal faceHeld = faceHeld(p);
+        final BigDecimal rate = p.getIntRate() == null ? BigDecimal.ZERO : p.getIntRate();
+        final List<InvestmentInterestPosting> posted = this.postingRepository.findByPurchaseIdOrderByIntDateAsc(p.getId());
+        final boolean active = InvestmentPurchaseApiConstants.STATUS_ACTIVE.equals(p.getStatus());
+        final LocalDate reminderUpTo = today.plusDays(InvestmentInterestApiConstants.DUE_WITHIN_DAYS);
+
+        final List<InvestmentInterestScheduleData.Row> rows = new ArrayList<>();
+        boolean nextFound = false;
+        for (final InvestmentInterestCalculator.ScheduleRow r : scheduleRows(p)) {
+            final Optional<InvestmentInterestPosting> done = postingFor(posted, r);
+            final boolean isNext = active && done.isEmpty() && !nextFound;
+            if (isNext) {
+                nextFound = true;
+            }
+            rows.add(InvestmentInterestScheduleData.Row.builder().type(r.type()).intDate(format(r.date())).fromDate(format(r.fromDate()))
+                    .toDate(format(r.toDate())).days(r.days()).grossInterest(r.grossInterest()).alreadyBooked(r.alreadyBooked())
+                    .amount(r.amount()).due(!r.date().isAfter(asOn)).posted(done.isPresent())
+                    .voucherNo(done.map(InvestmentInterestPosting::getVoucherNo).orElse(null))
+                    .glTransactionId(done.map(InvestmentInterestPosting::getGlTransactionId).orElse(null))
+                    .postedOnDate(done.map(x -> format(x.getPostedOnDate())).orElse(null)).postable(isNext && !r.date().isAfter(today))
+                    .dueSoon(active && done.isEmpty() && !r.date().isAfter(reminderUpTo)).build());
+        }
+
+        final GLAccount incomeGl = this.glAccountRepository
+                .findOneByGlCodeWithNotFoundDetection(InvestmentInterestApiConstants.interestIncomeGlCode(p.getBondType()));
+        return InvestmentInterestScheduleData.builder().purchaseId(p.getId()).dealNo(p.getDealNo()).certNo(p.getCertNo())
+                .scriptCode(p.getScript().getScriptCode()).scriptDesc(p.getScript().getScriptDesc()).faceValue(faceHeld)
+                .unitValue(p.getScript().getFaceValuePerUnit()).balanceUnits(p.getBalanceUnits()).purchaseRate(p.getPurchaseRate())
+                .bookValue(p.getBookValue()).intRate(p.getIntRate()).dealDate(format(p.getDealDate()))
+                .lastIntDate(format(p.getLastIntDate())).maturityDate(format(p.getMaturityDate()))
+                .purchasedAccruedInterest(p.getAccruedInterest())
+                .couponPerHalfYear(rate.signum() > 0 ? InvestmentInterestCalculator.halfYearCoupon(faceHeld, rate) : BigDecimal.ZERO)
+                .asOnDate(format(asOn)).interestGlCode(incomeGl.getGlCode()).interestGlName(incomeGl.getName())
+                .bankGlAccountId(p.getCrGlAccount().getId()).bankGlCode(p.getCrGlAccount().getGlCode())
+                .bankGlName(p.getCrGlAccount().getName()).status(p.getStatus()).rows(rows).build();
+    }
+
+    /** The holding's interest schedule (from its settlement date to maturity) on the face value still held. */
+    public List<InvestmentInterestCalculator.ScheduleRow> scheduleRows(final InvestmentPurchase p) {
+        final BigDecimal rate = p.getIntRate() == null ? BigDecimal.ZERO : p.getIntRate();
+        return InvestmentInterestCalculator.schedule(faceHeld(p), rate, p.getMaturityDate(), p.getLastIntDate(), p.getSettlementDate());
+    }
+
+    /**
+     * Tasks: for every active holding, its next unposted interest line when that line's date is past or within
+     * {@code withinDays} days — what has to be posted with a voucher now or shortly.
+     */
+    public List<InvestmentInterestDueData> retrieveDueInterest(final int withinDays) {
+        final LocalDate today = DateUtils.getBusinessLocalDate();
+        final LocalDate upTo = today.plusDays(Math.max(withinDays, 0));
+        final List<InvestmentInterestDueData> due = new ArrayList<>();
+        for (final InvestmentPurchase p : this.purchaseRepository.findAll(Sort.by(Sort.Direction.ASC, "id"))) {
+            if (!InvestmentPurchaseApiConstants.STATUS_ACTIVE.equals(p.getStatus())) {
+                continue;
+            }
+            final List<InvestmentInterestPosting> posted = this.postingRepository.findByPurchaseIdOrderByIntDateAsc(p.getId());
+            scheduleRows(p).stream().filter(r -> postingFor(posted, r).isEmpty()).findFirst().filter(r -> !r.date().isAfter(upTo))
+                    .ifPresent(r -> due.add(InvestmentInterestDueData.builder().purchaseId(p.getId()).dealNo(p.getDealNo())
+                            .certNo(p.getCertNo()).scriptCode(p.getScript().getScriptCode()).scriptDesc(p.getScript().getScriptDesc())
+                            .lineType(r.type()).intDate(format(r.date())).grossInterest(r.grossInterest()).amount(r.amount())
+                            .postable(!r.date().isAfter(today)).overdue(r.date().isBefore(today)).build()));
+        }
+        return due;
+    }
+
+    private static Optional<InvestmentInterestPosting> postingFor(final List<InvestmentInterestPosting> posted,
+            final InvestmentInterestCalculator.ScheduleRow r) {
+        return posted.stream().filter(x -> x.getLineType().equals(r.type()) && x.getIntDate().equals(r.date())).findFirst();
+    }
+
+    private static BigDecimal faceHeld(final InvestmentPurchase p) {
+        return p.getBalanceUnits().multiply(p.getScript().getFaceValuePerUnit());
+    }
+
+    private InvestmentPurchase find(final Long purchaseId) {
+        return this.purchaseRepository.findById(purchaseId).orElseThrow(() -> new InvestmentPurchaseNotFoundException(purchaseId));
+    }
+
+    private static String format(final LocalDate date) {
+        return date == null ? null : date.format(DATE_FORMAT);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentPurchaseWritePlatformService.java

@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+
+public interface InvestmentPurchaseWritePlatformService {
+
+    CommandProcessingResult createPurchase(JsonCommand command);
+
+    CommandProcessingResult deletePurchase(Long purchaseId);
+
+    CommandProcessingResult settlePurchase(Long purchaseId, JsonCommand command);
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/investment/service/InvestmentPurchaseWritePlatformServiceImpl.java

@@ -0,0 +1,317 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.BOND_TYPE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.BROKEN_PERIOD_INTEREST_GL_CODE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.BROKERAGE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.BROKERAGE_GL_CODE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.CATEGORY;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.CONSIDER_AMT;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.CR_GL_ACCOUNT_ID;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.DEAL_DATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.DEAL_TIME;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.FACE_VALUE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.LAST_INT_DATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.NAV;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.OTHER_CHARGES;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.OTHER_CHARGES_GL_CODE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.OTHER_DETAILS;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.PARTY_ID;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.PURCHASE_RATE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.SCRIPT_ID;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.SETTLEMENT_TYPE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.STAMP_DUTY;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.STAMP_DUTY_GL_CODE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.STATUS_ACTIVE;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.STATUS_PENDING_SETTLEMENT;
+import static org.apache.fineract.portfolio.investment.api.InvestmentPurchaseApiConstants.SUB_TYPE;
+
+import com.google.gson.JsonElement;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.accounting.glaccount.domain.GLAccountRepositoryWrapper;
+import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
+import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.portfolio.investment.domain.InvestmentParty;
+import org.apache.fineract.portfolio.investment.domain.InvestmentPartyRepository;
+import org.apache.fineract.portfolio.investment.domain.InvestmentPurchase;
+import org.apache.fineract.portfolio.investment.domain.InvestmentPurchaseRepository;
+import org.apache.fineract.portfolio.investment.domain.InvestmentScript;
+import org.apache.fineract.portfolio.investment.domain.InvestmentScriptRepository;
+import org.apache.fineract.portfolio.investment.exception.InvestmentPartyNotFoundException;
+import org.apache.fineract.portfolio.investment.exception.InvestmentPurchaseNotFoundException;
+import org.apache.fineract.portfolio.investment.exception.InvestmentScriptNotFoundException;
+import org.apache.fineract.portfolio.investment.serialization.InvestmentPurchaseCommandFromApiJsonDeserializer;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Saves a Purchase Entry as a holding. Every derived figure is computed here from the script master and the deal
+ * inputs, so the stored deal does not depend on what the screen calculated. No GL entry is posted yet.
+ */
+@Service
+@RequiredArgsConstructor
+public class InvestmentPurchaseWritePlatformServiceImpl implements InvestmentPurchaseWritePlatformService {
+
+    private static final BigDecimal HUNDRED = BigDecimal.valueOf(100);
+
+    private final InvestmentPurchaseCommandFromApiJsonDeserializer validator;
+    private final InvestmentPurchaseRepository purchaseRepository;
+    private final InvestmentScriptRepository scriptRepository;
+    private final InvestmentPartyRepository partyRepository;
+    private final GLAccountRepositoryWrapper glAccountRepository;
+    private final JdbcTemplate jdbcTemplate;
+    private final InvestmentJournalPoster journalPoster;
+
+    @Override
+    @Transactional
+    public CommandProcessingResult createPurchase(final JsonCommand command) {
+        this.validator.validateForCreate(command.json());
+
+        final String bondType = command.stringValueOfParameterNamed(BOND_TYPE);
+        final Long scriptId = command.longValueOfParameterNamed(SCRIPT_ID);
+        final InvestmentScript script = this.scriptRepository.findById(scriptId)
+                .orElseThrow(() -> new InvestmentScriptNotFoundException(scriptId));
+        final Long partyId = command.longValueOfParameterNamed(PARTY_ID);
+        final InvestmentParty party = this.partyRepository.findById(partyId)
+                .orElseThrow(() -> new InvestmentPartyNotFoundException(partyId));
+        if (!script.isActive()) {
+            throw rule("script.inactive", "Script " + script.getScriptCode() + " is inactive");
+        }
+        if (!script.getBondType().equals(bondType)) {
+            throw rule("script.bondtype.mismatch",
+                    "Script " + script.getScriptCode() + " is a " + script.getBondType() + ", not " + bondType);
+        }
+        if (!party.isActive()) {
+            throw rule("party.inactive", "Party " + party.getPartyCode() + " is inactive");
+        }
+
+        final LocalDate dealDate = command.localDateValueOfParameterNamed(DEAL_DATE);
+        if (script.getMaturityDate() != null && dealDate.isAfter(script.getMaturityDate())) {
+            throw rule("deal.after.maturity", "Deal date is after the security's maturity date " + script.getMaturityDate());
+        }
+        final String settlementType = command.stringValueOfParameterNamed(SETTLEMENT_TYPE);
+
+        final InvestmentPurchase p = new InvestmentPurchase();
+        p.setDealNo(nextDealNo(dealDate));
+        p.setCertNo(nextCertNo());
+        p.setBondType(bondType);
+        p.setScript(script);
+        p.setParty(party);
+        p.setDealDate(dealDate);
+        p.setDealTime(StringUtils.trimToNull(command.stringValueOfParameterNamedAllowingNull(DEAL_TIME)));
+        p.setSettlementType(settlementType);
+        p.setSettlementDate(dealDate.plusDays(Long.parseLong(settlementType.substring(2))));
+        p.setCategory(command.stringValueOfParameterNamed(CATEGORY));
+        p.setSubType(StringUtils.trimToNull(command.stringValueOfParameterNamedAllowingNull(SUB_TYPE)));
+        p.setIntRate(script.getIntRate());
+        p.setIssueDate(script.getIssueDate());
+        p.setMaturityDate(script.getMaturityDate());
+        p.setInvestmentGlAccount(script.getGlAccount());
+        p.setCrGlAccount(postableAssetGl(command.longValueOfParameterNamed(CR_GL_ACCOUNT_ID)));
+        p.setOtherDetails(otherDetails(command));
+        p.setStatus(STATUS_PENDING_SETTLEMENT);
+
+        // Brokerage, stamp duty and other charges are expenses of the deal (Jitendra Sir): paid with the
+        // settlement, but kept out of the book value so the charges stay visible on their own GLs.
+        p.setBrokerage(zeroIfNull(command.bigDecimalValueOfParameterNamed(BROKERAGE)));
+        p.setStampDuty(zeroIfNull(command.bigDecimalValueOfParameterNamed(STAMP_DUTY)));
+        p.setOtherCharges(zeroIfNull(command.bigDecimalValueOfParameterNamed(OTHER_CHARGES)));
+        if ("MUTUAL_FUND".equals(bondType)) {
+            computeMutualFund(p, command);
+        } else {
+            computeSecurity(p, command, script);
+        }
+        p.setSettlementAmount(p.getBookValue().add(p.getAccruedInterest()).add(totalCharges(p)));
+
+        final InvestmentPurchase saved = this.purchaseRepository.saveAndFlush(p);
+        return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(saved.getId())
+                .withResourceIdAsString(saved.getDealNo()).build();
+    }
+
+    @Override
+    @Transactional
+    public CommandProcessingResult deletePurchase(final Long purchaseId) {
+        final InvestmentPurchase p = this.purchaseRepository.findById(purchaseId)
+                .orElseThrow(() -> new InvestmentPurchaseNotFoundException(purchaseId));
+        if (!STATUS_PENDING_SETTLEMENT.equals(p.getStatus())) {
+            throw rule("purchase.settled", "Deal " + p.getDealNo() + " is already settled and posted to GL, so it cannot be dropped");
+        }
+        if (p.getBalanceUnits().compareTo(p.getUnits()) != 0) {
+            throw rule("purchase.partly.sold", "Deal " + p.getDealNo() + " has been partly sold and cannot be dropped");
+        }
+        this.purchaseRepository.delete(p);
+        this.purchaseRepository.flush();
+        return new CommandProcessingResultBuilder().withEntityId(purchaseId).withResourceIdAsString(p.getDealNo()).build();
+    }
+
+    /**
+     * Settles a deal: on or after its settlement date the money has gone and the security has come in, so the purchase
+     * is posted to GL dated the settlement date (settlement-date accounting) and the deal becomes a holding. Posted
+     * through the journal entry command like any manual entry, inside this transaction, so under maker-checker nothing
+     * reaches the GL until the settlement is approved.
+     */
+    @Override
+    @Transactional
+    public CommandProcessingResult settlePurchase(final Long purchaseId, final JsonCommand command) {
+        final InvestmentPurchase p = this.purchaseRepository.findById(purchaseId)
+                .orElseThrow(() -> new InvestmentPurchaseNotFoundException(purchaseId));
+        if (!STATUS_PENDING_SETTLEMENT.equals(p.getStatus())) {
+            throw rule("settle.not.pending", "Deal " + p.getDealNo() + " is not pending settlement");
+        }
+        final LocalDate today = DateUtils.getBusinessLocalDate();
+        if (p.getSettlementDate().isAfter(today)) {
+            throw rule("settle.before.date", "Deal " + p.getDealNo() + " can be settled on or after its settlement date "
+                    + p.getSettlementDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")));
+        }
+
+        final InvestmentJournalPoster.Lines lines = new InvestmentJournalPoster.Lines()
+                .debit(p.getInvestmentGlAccount().getId(), p.getBookValue())
+                .debit(this.journalPoster.glId(BROKEN_PERIOD_INTEREST_GL_CODE), p.getAccruedInterest())
+                .debit(this.journalPoster.glId(STAMP_DUTY_GL_CODE), p.getStampDuty())
+                .debit(this.journalPoster.glId(BROKERAGE_GL_CODE), p.getBrokerage())
+                .debit(this.journalPoster.glId(OTHER_CHARGES_GL_CODE), p.getOtherCharges())
+                .credit(p.getCrGlAccount().getId(), p.getSettlementAmount());
+        final CommandProcessingResult posted = this.journalPoster.post(p.getSettlementDate(), p.getDealNo(),
+                "Investment purchase settled: deal " + p.getDealNo() + ", " + p.getScript().getScriptCode() + " "
+                        + p.getScript().getScriptDesc() + ", " + p.getParty().getPartyName(),
+                lines);
+
+        p.setGlTransactionId(posted.getTransactionId());
+        p.setSettledOnDate(today);
+        p.setStatus(STATUS_ACTIVE);
+        this.purchaseRepository.saveAndFlush(p);
+        return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(purchaseId)
+                .withResourceIdAsString(p.getDealNo()).withTransactionId(posted.getTransactionId()).build();
+    }
+
+    /** Govt Security / Bond: face value at a price per ₹100, plus interest owed to the seller since the last coupon. */
+    private void computeSecurity(final InvestmentPurchase p, final JsonCommand command, final InvestmentScript script) {
+        final BigDecimal faceValue = command.bigDecimalValueOfParameterNamed(FACE_VALUE);
+        final BigDecimal rate = command.bigDecimalValueOfParameterNamed(PURCHASE_RATE);
+        final LocalDate lastIntDate = command.localDateValueOfParameterNamed(LAST_INT_DATE);
+        if (lastIntDate.isAfter(p.getDealDate())) {
+            throw rule("lastint.after.deal", "Last interest date cannot be after the deal date");
+        }
+        final BigDecimal units = faceValue.divide(script.getFaceValuePerUnit(), 6, RoundingMode.HALF_UP);
+        final BigDecimal cost = faceValue.multiply(rate).divide(HUNDRED, 2, RoundingMode.HALF_UP);
+        // Broken-period interest runs to the settlement date, when the bond leaves the seller (RBI 83, Jitendra Sir).
+        final int days = InvestmentInterestCalculator.days360(lastIntDate, p.getSettlementDate());
+        final BigDecimal intRate = zeroIfNull(script.getIntRate());
+        final BigDecimal accrued = InvestmentInterestCalculator.interestForDays(faceValue, intRate, days);
+
+        p.setFaceValue(faceValue);
+        p.setPurchaseRate(rate);
+        p.setUnits(units);
+        p.setBalanceUnits(units);
+        p.setBookValue(cost);
+        p.setPremiumDiscount(faceValue.multiply(rate.subtract(HUNDRED)).divide(HUNDRED, 2, RoundingMode.HALF_UP));
+        p.setLastIntDate(lastIntDate);
+        p.setAccruedDays(days);
+        p.setAccruedInterest(accrued);
+        p.setYtm(approxYtm(intRate, rate, script.getIssueDate(), script.getMaturityDate()));
+    }
+
+    /** Mutual fund: the amount invested buys units at the NAV. */
+    private void computeMutualFund(final InvestmentPurchase p, final JsonCommand command) {
+        final BigDecimal amount = command.bigDecimalValueOfParameterNamed(CONSIDER_AMT);
+        final BigDecimal nav = command.bigDecimalValueOfParameterNamed(NAV);
+        final BigDecimal units = amount.divide(nav, 3, RoundingMode.HALF_UP);
+
+        p.setFaceValue(amount);
+        p.setPurchaseRate(nav);
+        p.setUnits(units);
+        p.setBalanceUnits(units);
+        p.setBookValue(amount);
+        p.setAccruedInterest(BigDecimal.ZERO);
+        p.setAccruedDays(0);
+    }
+
+    private static BigDecimal totalCharges(final InvestmentPurchase p) {
+        return p.getBrokerage().add(p.getStampDuty()).add(p.getOtherCharges());
+    }
+
+    /** Approximate yield: coupon adjusted for the discount/premium spread over the security's life, over the price. */
+    static BigDecimal approxYtm(final BigDecimal coupon, final BigDecimal price, final LocalDate issue, final LocalDate maturity) {
+        if (coupon.signum() == 0 || issue == null || maturity == null || !maturity.isAfter(issue)) {
+            return coupon;
+        }
+        final double years = ChronoUnit.DAYS.between(issue, maturity) / 365.25;
+        final double ytm = (coupon.doubleValue() + (100 - price.doubleValue()) / years) / price.doubleValue() * 100;
+        return BigDecimal.valueOf(ytm).setScale(2, RoundingMode.HALF_UP);
+    }
+
+    /** Financial-year deal number: FY start year + FY end (2 digits) + 6-digit running number, e.g. 202627000001. */
+    private String nextDealNo(final LocalDate dealDate) {
+        final String prefix = dealNoPrefix(dealDate);
+        final Integer max = this.jdbcTemplate.queryForObject(
+                "SELECT MAX(CAST(SUBSTRING(deal_no FROM 7) AS INTEGER)) FROM m_investment_purchase WHERE deal_no LIKE ?", Integer.class,
+                prefix + "%");
+        return prefix + String.format("%06d", (max == null ? 0 : max) + 1);
+    }
+
+    /** Financial year (April–March) of the deal date: 2026-04-01 … 2027-03-31 → "202627". */
+    static String dealNoPrefix(final LocalDate dealDate) {
+        final int fyStart = dealDate.getMonthValue() >= 4 ? dealDate.getYear() : dealDate.getYear() - 1;
+        return fyStart + String.format("%02d", (fyStart + 1) % 100);
+    }
+
+    private String nextCertNo() {
+        final Integer max = this.jdbcTemplate.queryForObject(
+                "SELECT MAX(CAST(cert_no AS INTEGER)) FROM m_investment_purchase WHERE cert_no ~ '^[0-9]+$'", Integer.class);
+        return String.valueOf((max == null ? 0 : max) + 1);
+    }
+
+    private static String otherDetails(final JsonCommand command) {
+        if (!command.parameterExists(OTHER_DETAILS)) {
+            return null;
+        }
+        final JsonElement other = command.parsedJson().getAsJsonObject().get(OTHER_DETAILS);
+        return other == null || other.isJsonNull() ? null : other.toString();
+    }
+
+    /** The paying bank account must be an enabled ASSET detail GL. */
+    private GLAccount postableAssetGl(final Long glAccountId) {
+        final GLAccount gl = this.glAccountRepository.findOneWithNotFoundDetection(glAccountId);
+        if (gl.isHeaderAccount() || gl.isDisabled() || !GLAccountType.ASSET.getValue().equals(gl.getType())) {
+            throw rule("cr.glaccount.invalid", "CR. To A/c " + gl.getGlCode() + " must be an enabled Asset detail account");
+        }
+        return gl;
+    }
+
+    private static BigDecimal zeroIfNull(final BigDecimal value) {
+        return value == null ? BigDecimal.ZERO : value;
+    }
+
+    private static GeneralPlatformDomainRuleException rule(final String code, final String message) {
+        return new GeneralPlatformDomainRuleException("error.msg.investmentpurchase." + code, message);
+    }
+}

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResource.java

@@ -58,6 +58,7 @@ import org.apache.fineract.infrastructure.core.api.jersey.Pagination;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.DateFormat;
 import org.apache.fineract.infrastructure.core.domain.ExternalId;
+import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.apache.fineract.infrastructure.core.exception.UnrecognizedQueryParamException;
 import org.apache.fineract.infrastructure.core.serialization.ApiRequestJsonSerializationSettings;
 import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer;
@@ -737,6 +738,10 @@ public class LoanTransactionsApiResource {
             commandRequest = builder.buyDownFeeAdjustment(resolvedLoanId, resolvedTransactionId).build();
         } else if (CommandParameterUtil.is(commandParam, INTEREST_REFUND_COMMAND_VALUE)) {
             commandRequest = builder.manualInterestRefund(resolvedLoanId, resolvedTransactionId).build();
+        } else if (apiRequestBodyAsJson != null
+                && apiRequestBodyAsJson.matches("(?s).*\"transactionAmount\"\\s*:\\s*\"?0(\\.0*)?\"?\\s*[,}].*")) {
+            throw new PlatformDataIntegrityException("error.msg.loan.transaction.undo.not.allowed",
+                    "Undo of a loan transaction is not allowed.");
         } else { // Default to adjust the Loan Transaction
             commandRequest = builder.adjustTransaction(resolvedLoanId, resolvedTransactionId).build();
         }

fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/CurrentAccountTransactionsApiResource.java

@@ -43,6 +43,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.apache.fineract.infrastructure.core.exception.UnrecognizedQueryParamException;
 import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
@@ -140,6 +141,11 @@ public class CurrentAccountTransactionsApiResource {
             @QueryParam("command") final String commandParam,
             @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
+        if (is(commandParam, "undo") || is(commandParam, "reverse")) {
+            throw new PlatformDataIntegrityException("error.msg.currentaccount.transaction.undo.not.allowed",
+                    "Undo or reverse of a current account transaction is not allowed.");
+        }
+
         final CommandWrapperBuilder builder = new CommandWrapperBuilder().withJson(apiRequestBodyAsJson);
 
         CommandProcessingResult result = null;

fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountTransactionsApiResource.java

@@ -40,6 +40,7 @@ import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
 import org.apache.fineract.infrastructure.core.api.ApiRequestParameterHelper;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.apache.fineract.infrastructure.core.exception.UnrecognizedQueryParamException;
 import org.apache.fineract.infrastructure.core.serialization.ApiRequestJsonSerializationSettings;
 import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer;
@@ -148,6 +149,11 @@ public class FixedDepositAccountTransactionsApiResource {
             @PathParam("transactionId") final Long transactionId, @QueryParam("command") final String commandParam,
             final String apiRequestBodyAsJson) {
 
+        if (is(commandParam, DepositsApiConstants.COMMAND_UNDO_TRANSACTION)) {
+            throw new PlatformDataIntegrityException("error.msg.fixeddeposit.transaction.undo.not.allowed",
+                    "Undo of a fixed deposit transaction is not allowed.");
+        }
+
         String jsonApiRequest = apiRequestBodyAsJson;
         if (StringUtils.isBlank(jsonApiRequest)) {
             jsonApiRequest = "{}";

fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountTransactionsApiResource.java

@@ -47,6 +47,7 @@ import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
 import org.apache.fineract.infrastructure.core.api.ApiRequestParameterHelper;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.apache.fineract.infrastructure.core.exception.UnrecognizedQueryParamException;
 import org.apache.fineract.infrastructure.core.serialization.ApiRequestJsonSerializationSettings;
 import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer;
@@ -202,6 +203,11 @@ public class RecurringDepositAccountTransactionsApiResource {
             @QueryParam("command") @Parameter(description = "command") final String commandParam,
             @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
+        if (is(commandParam, DepositsApiConstants.COMMAND_UNDO_TRANSACTION)) {
+            throw new PlatformDataIntegrityException("error.msg.recurringdeposit.transaction.undo.not.allowed",
+                    "Undo of a recurring deposit transaction is not allowed.");
+        }
+
         String jsonApiRequest = apiRequestBodyAsJson;
         if (StringUtils.isBlank(jsonApiRequest)) {
             jsonApiRequest = "{}";

fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountTransactionsApiResource.java

@@ -48,6 +48,7 @@ import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
 import org.apache.fineract.infrastructure.core.api.ApiRequestParameterHelper;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.apache.fineract.infrastructure.core.exception.UnrecognizedQueryParamException;
 import org.apache.fineract.infrastructure.core.serialization.ApiRequestJsonSerializationSettings;
 import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer;
@@ -218,6 +219,12 @@ public class SavingsAccountTransactionsApiResource {
     public String adjustTransaction(@PathParam("savingsId") final Long savingsId, @PathParam("transactionId") final Long transactionId,
             @QueryParam("command") final String commandParam, final String apiRequestBodyAsJson) {
 
+        if (is(commandParam, SavingsApiConstants.COMMAND_UNDO_TRANSACTION)
+                || is(commandParam, SavingsApiConstants.COMMAND_REVERSE_TRANSACTION)) {
+            throw new PlatformDataIntegrityException("error.msg.savings.transaction.undo.not.allowed",
+                    "Undo or reverse of a savings transaction is not allowed.");
+        }
+
         String jsonApiRequest = apiRequestBodyAsJson;
         if (StringUtils.isBlank(jsonApiRequest)) {
             jsonApiRequest = "{}";

fineract-provider/src/main/resources/db/changelog/tenant/final-changelog-tenant.xml

@@ -173,4 +173,11 @@
     <include file="parts/0597_enable_recurring_deposit_product_maker_checker.xml" relativeToChangelogFile="true"/>
     <include file="parts/0598_recurring_deposit_extend_tenure_permission.xml" relativeToChangelogFile="true"/>
     <include file="parts/0593_fd_interest_posting_approval.xml" relativeToChangelogFile="true"/>
+    <include file="parts/0599_cash_exchange_customer_pan.xml" relativeToChangelogFile="true"/>
+    <include file="parts/0593_investment_masters.xml" relativeToChangelogFile="true"/>
+    <include file="parts/0594_investment_purchase.xml" relativeToChangelogFile="true"/>
+    <include file="parts/0595_investment_purchase_other_charges.xml" relativeToChangelogFile="true"/>
+    <include file="parts/0596_investment_daily_rate.xml" relativeToChangelogFile="true"/>
+    <include file="parts/0597_investment_purchase_settlement.xml" relativeToChangelogFile="true"/>
+    <include file="parts/0600_investment_interest_posting.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

fineract-provider/src/main/resources/db/changelog/tenant/parts/0593_investment_masters.xml

@@ -0,0 +1,216 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
+
+    <!--
+        Treasury Investment masters, following the bank's existing CBS screens:
+        - m_investment_party  : Bank / Party Master (whom an investment is bought from / placed with)
+        - m_investment_script : Script Master (what is bought - Govt Security, Bond, Mutual Fund, ...)
+        Party and script codes are generated by the application (PTY-001, G00001). Both rows are
+        tied to the investment (asset) GL they are booked to.
+    -->
+
+    <changeSet author="cbs-anshul" id="0593-1-create-investment-party">
+        <preConditions onFail="MARK_RAN">
+            <not><tableExists tableName="m_investment_party"/></not>
+        </preConditions>
+        <createTable tableName="m_investment_party">
+            <column name="id" type="BIGINT" autoIncrement="true"><constraints nullable="false" primaryKey="true"/></column>
+            <column name="party_code" type="VARCHAR(20)"><constraints nullable="false"/></column>
+            <column name="bond_type" type="VARCHAR(20)"><constraints nullable="false"/></column>
+            <column name="party_name" type="VARCHAR(150)"><constraints nullable="false"/></column>
+            <column name="address1" type="VARCHAR(150)"/>
+            <column name="address2" type="VARCHAR(150)"/>
+            <column name="address3" type="VARCHAR(150)"/>
+            <column name="city" type="VARCHAR(100)"/>
+            <column name="pincode" type="VARCHAR(10)"/>
+            <column name="phone" type="VARCHAR(20)"/>
+            <column name="fax" type="VARCHAR(20)"/>
+            <column name="bank_type" type="VARCHAR(60)"/>
+            <column name="gl_account_id" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="rbi_code" type="VARCHAR(30)"/>
+            <column name="exposure_limit" type="DECIMAL(19,6)"/>
+            <column name="lei_no" type="VARCHAR(30)"/>
+            <column name="cp_bank_name" type="VARCHAR(150)"/>
+            <column name="cp_branch_name" type="VARCHAR(150)"/>
+            <column name="cp_account_no" type="VARCHAR(40)"/>
+            <column name="cp_ifsc" type="VARCHAR(11)"/>
+            <column name="is_active" type="BOOLEAN" defaultValueBoolean="true"><constraints nullable="false"/></column>
+            <column name="created_by" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="created_on_utc" type="DATETIME"><constraints nullable="false"/></column>
+            <column name="last_modified_by" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="last_modified_on_utc" type="DATETIME"><constraints nullable="false"/></column>
+        </createTable>
+        <addUniqueConstraint tableName="m_investment_party" columnNames="party_code" constraintName="uq_investment_party_code"/>
+        <addForeignKeyConstraint baseTableName="m_investment_party" baseColumnNames="gl_account_id" constraintName="fk_investment_party_gl_account"
+                                 referencedTableName="acc_gl_account" referencedColumnNames="id"/>
+        <createIndex tableName="m_investment_party" indexName="idx_investment_party_bond_type">
+            <column name="bond_type"/>
+        </createIndex>
+    </changeSet>
+
+    <changeSet author="cbs-anshul" id="0593-2-create-investment-script">
+        <preConditions onFail="MARK_RAN">
+            <not><tableExists tableName="m_investment_script"/></not>
+        </preConditions>
+        <createTable tableName="m_investment_script">
+            <column name="id" type="BIGINT" autoIncrement="true"><constraints nullable="false" primaryKey="true"/></column>
+            <column name="script_code" type="VARCHAR(20)"><constraints nullable="false"/></column>
+            <column name="bond_type" type="VARCHAR(20)"><constraints nullable="false"/></column>
+            <column name="slr_type" type="VARCHAR(20)"/>
+            <column name="script_desc" type="VARCHAR(150)"><constraints nullable="false"/></column>
+            <column name="gl_account_id" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="isin" type="VARCHAR(20)"/>
+            <column name="face_value_per_unit" type="DECIMAL(19,6)"><constraints nullable="false"/></column>
+            <column name="int_rate" type="DECIMAL(9,4)"/>
+            <column name="issue_date" type="DATE"/>
+            <column name="maturity_date" type="DATE"/>
+            <column name="company_name" type="VARCHAR(150)"/>
+            <column name="address1" type="VARCHAR(150)"/>
+            <column name="address2" type="VARCHAR(150)"/>
+            <column name="address3" type="VARCHAR(150)"/>
+            <column name="city" type="VARCHAR(100)"/>
+            <column name="pincode" type="VARCHAR(10)"/>
+            <column name="phone" type="VARCHAR(20)"/>
+            <column name="fax" type="VARCHAR(20)"/>
+            <column name="corp_code" type="VARCHAR(30)"/>
+            <column name="is_active" type="BOOLEAN" defaultValueBoolean="true"><constraints nullable="false"/></column>
+            <column name="created_by" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="created_on_utc" type="DATETIME"><constraints nullable="false"/></column>
+            <column name="last_modified_by" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="last_modified_on_utc" type="DATETIME"><constraints nullable="false"/></column>
+        </createTable>
+        <addUniqueConstraint tableName="m_investment_script" columnNames="script_code" constraintName="uq_investment_script_code"/>
+        <addForeignKeyConstraint baseTableName="m_investment_script" baseColumnNames="gl_account_id" constraintName="fk_investment_script_gl_account"
+                                 referencedTableName="acc_gl_account" referencedColumnNames="id"/>
+        <createIndex tableName="m_investment_script" indexName="idx_investment_script_bond_type">
+            <column name="bond_type"/>
+        </createIndex>
+    </changeSet>
+
+    <changeSet author="cbs-anshul" id="0593-3-investment-master-permissions">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM m_permission WHERE code IN ('READ_INVESTMENTPARTY', 'CREATE_INVESTMENTPARTY', 'UPDATE_INVESTMENTPARTY', 'DELETE_INVESTMENTPARTY', 'READ_INVESTMENTSCRIPT', 'CREATE_INVESTMENTSCRIPT', 'UPDATE_INVESTMENTSCRIPT', 'CREATE_INVESTMENTPARTY_CHECKER', 'UPDATE_INVESTMENTPARTY_CHECKER', 'DELETE_INVESTMENTPARTY_CHECKER', 'CREATE_INVESTMENTSCRIPT_CHECKER', 'UPDATE_INVESTMENTSCRIPT_CHECKER')</sqlCheck>
+        </preConditions>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="READ_INVESTMENTPARTY"/>
+            <column name="entity_name" value="INVESTMENTPARTY"/>
+            <column name="action_name" value="READ"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="CREATE_INVESTMENTPARTY"/>
+            <column name="entity_name" value="INVESTMENTPARTY"/>
+            <column name="action_name" value="CREATE"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="UPDATE_INVESTMENTPARTY"/>
+            <column name="entity_name" value="INVESTMENTPARTY"/>
+            <column name="action_name" value="UPDATE"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="DELETE_INVESTMENTPARTY"/>
+            <column name="entity_name" value="INVESTMENTPARTY"/>
+            <column name="action_name" value="DELETE"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="READ_INVESTMENTSCRIPT"/>
+            <column name="entity_name" value="INVESTMENTSCRIPT"/>
+            <column name="action_name" value="READ"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="CREATE_INVESTMENTSCRIPT"/>
+            <column name="entity_name" value="INVESTMENTSCRIPT"/>
+            <column name="action_name" value="CREATE"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="UPDATE_INVESTMENTSCRIPT"/>
+            <column name="entity_name" value="INVESTMENTSCRIPT"/>
+            <column name="action_name" value="UPDATE"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="CREATE_INVESTMENTPARTY_CHECKER"/>
+            <column name="entity_name" value="INVESTMENTPARTY"/>
+            <column name="action_name" value="CREATE_CHECKER"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="UPDATE_INVESTMENTPARTY_CHECKER"/>
+            <column name="entity_name" value="INVESTMENTPARTY"/>
+            <column name="action_name" value="UPDATE_CHECKER"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="DELETE_INVESTMENTPARTY_CHECKER"/>
+            <column name="entity_name" value="INVESTMENTPARTY"/>
+            <column name="action_name" value="DELETE_CHECKER"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="CREATE_INVESTMENTSCRIPT_CHECKER"/>
+            <column name="entity_name" value="INVESTMENTSCRIPT"/>
+            <column name="action_name" value="CREATE_CHECKER"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="UPDATE_INVESTMENTSCRIPT_CHECKER"/>
+            <column name="entity_name" value="INVESTMENTSCRIPT"/>
+            <column name="action_name" value="UPDATE_CHECKER"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+    </changeSet>
+
+    <!-- Whoever already sees the Investment menu gets to read and maintain its masters. Maker-checker
+         is left off (can_maker_checker=false); it can be switched on per action from
+         Configure Maker Checker Tasks, and the _CHECKER rows above let a checker role approve. -->
+    <changeSet author="cbs-anshul" id="0593-4-grant-investment-master-permissions">
+        <sql>
+            INSERT INTO m_role_permission (role_id, permission_id)
+            SELECT rp.role_id, p.id
+            FROM m_role_permission rp
+            JOIN m_permission menu ON menu.id = rp.permission_id AND menu.code = 'MENU_INVESTMENT'
+            CROSS JOIN m_permission p
+            WHERE p.code IN ('READ_INVESTMENTPARTY', 'CREATE_INVESTMENTPARTY', 'UPDATE_INVESTMENTPARTY', 'DELETE_INVESTMENTPARTY', 'READ_INVESTMENTSCRIPT', 'CREATE_INVESTMENTSCRIPT', 'UPDATE_INVESTMENTSCRIPT')
+              AND NOT EXISTS (SELECT 1 FROM m_role_permission x WHERE x.role_id = rp.role_id AND x.permission_id = p.id)
+        </sql>
+    </changeSet>
+</databaseChangeLog>

fineract-provider/src/main/resources/db/changelog/tenant/parts/0594_investment_purchase.xml

@@ -0,0 +1,149 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
+
+    <!--
+        Investment Purchase Entry: one row per deal, which is the holding that interest, sale and
+        redemption later work against (balance_units tracks what is still held). Units, book value,
+        accrued interest and settlement amount are computed by the application. The optional legacy
+        deal fields (trade no, authorities, lien, delivery mode, ...) are kept in other_details as JSON.
+        No GL entry is posted by this table yet.
+    -->
+
+    <changeSet author="cbs-anshul" id="0594-1-create-investment-purchase">
+        <preConditions onFail="MARK_RAN">
+            <not><tableExists tableName="m_investment_purchase"/></not>
+        </preConditions>
+        <createTable tableName="m_investment_purchase">
+            <column name="id" type="BIGINT" autoIncrement="true"><constraints nullable="false" primaryKey="true"/></column>
+            <column name="deal_no" type="VARCHAR(20)"><constraints nullable="false"/></column>
+            <column name="cert_no" type="VARCHAR(20)"><constraints nullable="false"/></column>
+            <column name="bond_type" type="VARCHAR(20)"><constraints nullable="false"/></column>
+            <column name="script_id" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="party_id" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="deal_date" type="DATE"><constraints nullable="false"/></column>
+            <column name="deal_time" type="VARCHAR(8)"/>
+            <column name="settlement_type" type="VARCHAR(5)"><constraints nullable="false"/></column>
+            <column name="settlement_date" type="DATE"><constraints nullable="false"/></column>
+            <column name="face_value" type="DECIMAL(19,6)"><constraints nullable="false"/></column>
+            <column name="purchase_rate" type="DECIMAL(19,6)"><constraints nullable="false"/></column>
+            <column name="units" type="DECIMAL(19,6)"><constraints nullable="false"/></column>
+            <column name="balance_units" type="DECIMAL(19,6)"><constraints nullable="false"/></column>
+            <column name="brokerage" type="DECIMAL(19,6)"/>
+            <column name="stamp_duty" type="DECIMAL(19,6)"/>
+            <column name="book_value" type="DECIMAL(19,6)"><constraints nullable="false"/></column>
+            <column name="premium_discount" type="DECIMAL(19,6)"/>
+            <column name="int_rate" type="DECIMAL(9,4)"/>
+            <column name="issue_date" type="DATE"/>
+            <column name="maturity_date" type="DATE"/>
+            <column name="last_int_date" type="DATE"/>
+            <column name="accrued_days" type="INT"/>
+            <column name="accrued_interest" type="DECIMAL(19,6)"/>
+            <column name="settlement_amount" type="DECIMAL(19,6)"><constraints nullable="false"/></column>
+            <column name="ytm" type="DECIMAL(9,4)"/>
+            <column name="category" type="VARCHAR(40)"><constraints nullable="false"/></column>
+            <column name="sub_type" type="VARCHAR(40)"/>
+            <column name="investment_gl_account_id" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="cr_gl_account_id" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="other_details" type="VARCHAR(4000)"/>
+            <column name="status" type="VARCHAR(20)"><constraints nullable="false"/></column>
+            <column name="created_by" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="created_on_utc" type="DATETIME"><constraints nullable="false"/></column>
+            <column name="last_modified_by" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="last_modified_on_utc" type="DATETIME"><constraints nullable="false"/></column>
+        </createTable>
+        <addUniqueConstraint tableName="m_investment_purchase" columnNames="deal_no" constraintName="uq_investment_purchase_deal_no"/>
+        <addUniqueConstraint tableName="m_investment_purchase" columnNames="cert_no" constraintName="uq_investment_purchase_cert_no"/>
+        <addForeignKeyConstraint baseTableName="m_investment_purchase" baseColumnNames="script_id" constraintName="fk_investment_purchase_script"
+                                 referencedTableName="m_investment_script" referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="m_investment_purchase" baseColumnNames="party_id" constraintName="fk_investment_purchase_party"
+                                 referencedTableName="m_investment_party" referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="m_investment_purchase" baseColumnNames="investment_gl_account_id" constraintName="fk_investment_purchase_inv_gl"
+                                 referencedTableName="acc_gl_account" referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="m_investment_purchase" baseColumnNames="cr_gl_account_id" constraintName="fk_investment_purchase_cr_gl"
+                                 referencedTableName="acc_gl_account" referencedColumnNames="id"/>
+        <createIndex tableName="m_investment_purchase" indexName="idx_investment_purchase_script">
+            <column name="script_id"/>
+        </createIndex>
+        <createIndex tableName="m_investment_purchase" indexName="idx_investment_purchase_bond_type_status">
+            <column name="bond_type"/>
+            <column name="status"/>
+        </createIndex>
+    </changeSet>
+
+    <changeSet author="cbs-anshul" id="0594-2-investment-purchase-permissions">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM m_permission WHERE code IN ('READ_INVESTMENTPURCHASE', 'CREATE_INVESTMENTPURCHASE', 'DELETE_INVESTMENTPURCHASE', 'CREATE_INVESTMENTPURCHASE_CHECKER', 'DELETE_INVESTMENTPURCHASE_CHECKER')</sqlCheck>
+        </preConditions>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="READ_INVESTMENTPURCHASE"/>
+            <column name="entity_name" value="INVESTMENTPURCHASE"/>
+            <column name="action_name" value="READ"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="CREATE_INVESTMENTPURCHASE"/>
+            <column name="entity_name" value="INVESTMENTPURCHASE"/>
+            <column name="action_name" value="CREATE"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="DELETE_INVESTMENTPURCHASE"/>
+            <column name="entity_name" value="INVESTMENTPURCHASE"/>
+            <column name="action_name" value="DELETE"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="CREATE_INVESTMENTPURCHASE_CHECKER"/>
+            <column name="entity_name" value="INVESTMENTPURCHASE"/>
+            <column name="action_name" value="CREATE_CHECKER"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="DELETE_INVESTMENTPURCHASE_CHECKER"/>
+            <column name="entity_name" value="INVESTMENTPURCHASE"/>
+            <column name="action_name" value="DELETE_CHECKER"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+    </changeSet>
+
+    <!-- Same roles as the masters: whoever sees the Investment menu. Maker-checker stays off until
+         switched on from Configure Maker Checker Tasks. -->
+    <changeSet author="cbs-anshul" id="0594-3-grant-investment-purchase-permissions">
+        <sql>
+            INSERT INTO m_role_permission (role_id, permission_id)
+            SELECT rp.role_id, p.id
+            FROM m_role_permission rp
+            JOIN m_permission menu ON menu.id = rp.permission_id AND menu.code = 'MENU_INVESTMENT'
+            CROSS JOIN m_permission p
+            WHERE p.code IN ('READ_INVESTMENTPURCHASE', 'CREATE_INVESTMENTPURCHASE', 'DELETE_INVESTMENTPURCHASE')
+              AND NOT EXISTS (SELECT 1 FROM m_role_permission x WHERE x.role_id = rp.role_id AND x.permission_id = p.id)
+        </sql>
+    </changeSet>
+</databaseChangeLog>

fineract-provider/src/main/resources/db/changelog/tenant/parts/0595_investment_purchase_other_charges.xml

@@ -0,0 +1,40 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
+
+    <!--
+        Other charges on an investment deal (legal, SGL, CCIL, ...), kept next to brokerage and stamp
+        duty. All three are expenses of the deal (Jitendra Sir): they are paid with the settlement but
+        are not part of the book value of the investment.
+    -->
+
+    <changeSet author="cbs-anshul" id="0595-1-add-investment-purchase-other-charges">
+        <preConditions onFail="MARK_RAN">
+            <not><columnExists tableName="m_investment_purchase" columnName="other_charges"/></not>
+        </preConditions>
+        <addColumn tableName="m_investment_purchase">
+            <column name="other_charges" type="DECIMAL(19,6)"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>

fineract-provider/src/main/resources/db/changelog/tenant/parts/0596_investment_daily_rate.xml

@@ -0,0 +1,108 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
+
+    <!--
+        Daily Script Master: the market rate of each script for a day (open / high / low / close),
+        entered by treasury from FBIL / CCIL. Purchase Entry takes its rate from here instead of the
+        dealer typing it (Jitendra Sir). One row per script per day.
+    -->
+
+    <changeSet author="cbs-anshul" id="0596-1-create-investment-daily-rate">
+        <preConditions onFail="MARK_RAN">
+            <not><tableExists tableName="m_investment_daily_rate"/></not>
+        </preConditions>
+        <createTable tableName="m_investment_daily_rate">
+            <column name="id" type="BIGINT" autoIncrement="true"><constraints nullable="false" primaryKey="true"/></column>
+            <column name="script_id" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="rate_date" type="DATE"><constraints nullable="false"/></column>
+            <column name="open_rate" type="DECIMAL(19,6)"/>
+            <column name="high_rate" type="DECIMAL(19,6)"/>
+            <column name="low_rate" type="DECIMAL(19,6)"/>
+            <column name="close_rate" type="DECIMAL(19,6)"><constraints nullable="false"/></column>
+            <column name="created_by" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="created_on_utc" type="DATETIME"><constraints nullable="false"/></column>
+            <column name="last_modified_by" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="last_modified_on_utc" type="DATETIME"><constraints nullable="false"/></column>
+        </createTable>
+        <addUniqueConstraint tableName="m_investment_daily_rate" columnNames="script_id, rate_date"
+                             constraintName="uq_investment_daily_rate_script_date"/>
+        <addForeignKeyConstraint baseTableName="m_investment_daily_rate" baseColumnNames="script_id" constraintName="fk_investment_daily_rate_script"
+                                 referencedTableName="m_investment_script" referencedColumnNames="id"/>
+    </changeSet>
+
+    <changeSet author="cbs-anshul" id="0596-2-investment-daily-rate-permissions">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM m_permission WHERE code IN ('READ_INVESTMENTDAILYRATE', 'CREATE_INVESTMENTDAILYRATE', 'DELETE_INVESTMENTDAILYRATE', 'CREATE_INVESTMENTDAILYRATE_CHECKER', 'DELETE_INVESTMENTDAILYRATE_CHECKER')</sqlCheck>
+        </preConditions>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="READ_INVESTMENTDAILYRATE"/>
+            <column name="entity_name" value="INVESTMENTDAILYRATE"/>
+            <column name="action_name" value="READ"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="CREATE_INVESTMENTDAILYRATE"/>
+            <column name="entity_name" value="INVESTMENTDAILYRATE"/>
+            <column name="action_name" value="CREATE"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="DELETE_INVESTMENTDAILYRATE"/>
+            <column name="entity_name" value="INVESTMENTDAILYRATE"/>
+            <column name="action_name" value="DELETE"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="CREATE_INVESTMENTDAILYRATE_CHECKER"/>
+            <column name="entity_name" value="INVESTMENTDAILYRATE"/>
+            <column name="action_name" value="CREATE_CHECKER"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="DELETE_INVESTMENTDAILYRATE_CHECKER"/>
+            <column name="entity_name" value="INVESTMENTDAILYRATE"/>
+            <column name="action_name" value="DELETE_CHECKER"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+    </changeSet>
+
+    <!-- Same roles as the other investment screens: whoever sees the Investment menu. -->
+    <changeSet author="cbs-anshul" id="0596-3-grant-investment-daily-rate-permissions">
+        <sql>
+            INSERT INTO m_role_permission (role_id, permission_id)
+            SELECT rp.role_id, p.id
+            FROM m_role_permission rp
+            JOIN m_permission menu ON menu.id = rp.permission_id AND menu.code = 'MENU_INVESTMENT'
+            CROSS JOIN m_permission p
+            WHERE p.code IN ('READ_INVESTMENTDAILYRATE', 'CREATE_INVESTMENTDAILYRATE', 'DELETE_INVESTMENTDAILYRATE')
+              AND NOT EXISTS (SELECT 1 FROM m_role_permission x WHERE x.role_id = rp.role_id AND x.permission_id = p.id)
+        </sql>
+    </changeSet>
+</databaseChangeLog>

fineract-provider/src/main/resources/db/changelog/tenant/parts/0597_investment_purchase_settlement.xml

@@ -0,0 +1,74 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
+
+    <!--
+        Purchase settlement: a deal is saved as PENDING_SETTLEMENT and posted to GL only when it is settled on or
+        after its settlement date (settlement-date accounting). The journal entry transaction id and the settlement
+        day are kept on the deal. Settlement goes through maker-checker so the dealer cannot post their own deal.
+    -->
+
+    <changeSet author="cbs-anshul" id="0597-1-add-investment-purchase-settlement-columns">
+        <preConditions onFail="MARK_RAN">
+            <not><columnExists tableName="m_investment_purchase" columnName="gl_transaction_id"/></not>
+        </preConditions>
+        <addColumn tableName="m_investment_purchase">
+            <column name="gl_transaction_id" type="VARCHAR(50)"/>
+            <column name="settled_on_date" type="DATE"/>
+        </addColumn>
+    </changeSet>
+
+    <changeSet author="cbs-anshul" id="0597-2-investment-purchase-settle-permissions">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM m_permission WHERE code IN ('SETTLE_INVESTMENTPURCHASE', 'SETTLE_INVESTMENTPURCHASE_CHECKER')</sqlCheck>
+        </preConditions>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="SETTLE_INVESTMENTPURCHASE"/>
+            <column name="entity_name" value="INVESTMENTPURCHASE"/>
+            <column name="action_name" value="SETTLE"/>
+            <column name="can_maker_checker" valueBoolean="true"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="SETTLE_INVESTMENTPURCHASE_CHECKER"/>
+            <column name="entity_name" value="INVESTMENTPURCHASE"/>
+            <column name="action_name" value="SETTLE_CHECKER"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+    </changeSet>
+
+    <!-- Same roles as the other investment screens; any other user holding the checker permission approves. -->
+    <changeSet author="cbs-anshul" id="0597-3-grant-investment-purchase-settle-permissions">
+        <sql>
+            INSERT INTO m_role_permission (role_id, permission_id)
+            SELECT rp.role_id, p.id
+            FROM m_role_permission rp
+            JOIN m_permission menu ON menu.id = rp.permission_id AND menu.code = 'MENU_INVESTMENT'
+            CROSS JOIN m_permission p
+            WHERE p.code IN ('SETTLE_INVESTMENTPURCHASE', 'SETTLE_INVESTMENTPURCHASE_CHECKER')
+              AND NOT EXISTS (SELECT 1 FROM m_role_permission x WHERE x.role_id = rp.role_id AND x.permission_id = p.id)
+        </sql>
+    </changeSet>
+</databaseChangeLog>

fineract-provider/src/main/resources/db/changelog/tenant/parts/0599_cash_exchange_customer_pan.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.
+-->
+<!--
+    Cash exchange records who the customer was: an existing client is already linked through client_id,
+    a walk-in customer through the name and mobile captured at the counter. pan_number holds the PAN the
+    cashier verified, which is mandatory above Rs 50,000 (Income Tax Rule 114B, followed under RBI
+    cash-handling guidelines). All three are nullable: exchanges recorded before this change have none.
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                   http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
+
+    <changeSet id="0599_cash_exchange_add_customer_name" author="cbsnexora">
+        <preConditions onFail="MARK_RAN">
+            <not><columnExists tableName="m_cash_exchange" columnName="customer_name"/></not>
+        </preConditions>
+        <addColumn tableName="m_cash_exchange">
+            <column name="customer_name" type="VARCHAR(150)"/>
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="0599_cash_exchange_add_customer_mobile" author="cbsnexora">
+        <preConditions onFail="MARK_RAN">
+            <not><columnExists tableName="m_cash_exchange" columnName="customer_mobile"/></not>
+        </preConditions>
+        <addColumn tableName="m_cash_exchange">
+            <column name="customer_mobile" type="VARCHAR(20)"/>
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="0599_cash_exchange_add_pan_number" author="cbsnexora">
+        <preConditions onFail="MARK_RAN">
+            <not><columnExists tableName="m_cash_exchange" columnName="pan_number"/></not>
+        </preConditions>
+        <addColumn tableName="m_cash_exchange">
+            <column name="pan_number" type="VARCHAR(10)"/>
+        </addColumn>
+    </changeSet>
+
+</databaseChangeLog>

fineract-provider/src/main/resources/db/changelog/tenant/parts/0600_investment_interest_posting.xml

@@ -0,0 +1,103 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
+
+    <!--
+        Interest posting of investment holdings: each coupon received and each 31 March / 30 September provision is
+        posted to GL with a JV voucher, on or after its date and in date order. The voucher passes as it is raised
+        (Jitendra Sir: "auto pass"), so CREATE has no maker-checker.
+    -->
+
+    <changeSet author="cbs-anshul" id="0600-1-create-investment-interest-posting">
+        <preConditions onFail="MARK_RAN">
+            <not><tableExists tableName="m_investment_interest_posting"/></not>
+        </preConditions>
+        <createTable tableName="m_investment_interest_posting">
+            <column name="id" type="BIGINT" autoIncrement="true"><constraints nullable="false" primaryKey="true"/></column>
+            <column name="purchase_id" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="line_type" type="VARCHAR(20)"><constraints nullable="false"/></column>
+            <column name="int_date" type="DATE"><constraints nullable="false"/></column>
+            <column name="from_date" type="DATE"/>
+            <column name="to_date" type="DATE"/>
+            <column name="days" type="INT"/>
+            <column name="gross_interest" type="DECIMAL(19,6)"/>
+            <column name="already_booked" type="DECIMAL(19,6)"/>
+            <column name="amount" type="DECIMAL(19,6)"><constraints nullable="false"/></column>
+            <column name="bank_gl_account_id" type="BIGINT"/>
+            <column name="gl_transaction_id" type="VARCHAR(50)"/>
+            <column name="voucher_no" type="VARCHAR(30)"/>
+            <column name="posted_on_date" type="DATE"/>
+            <column name="created_by" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="created_on_utc" type="DATETIME"><constraints nullable="false"/></column>
+            <column name="last_modified_by" type="BIGINT"><constraints nullable="false"/></column>
+            <column name="last_modified_on_utc" type="DATETIME"><constraints nullable="false"/></column>
+        </createTable>
+        <addUniqueConstraint tableName="m_investment_interest_posting" columnNames="purchase_id, line_type, int_date"
+                             constraintName="uq_investment_interest_posting_line"/>
+        <addForeignKeyConstraint baseTableName="m_investment_interest_posting" baseColumnNames="purchase_id" constraintName="fk_investment_interest_posting_purchase"
+                                 referencedTableName="m_investment_purchase" referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="m_investment_interest_posting" baseColumnNames="bank_gl_account_id" constraintName="fk_investment_interest_posting_bank_gl"
+                                 referencedTableName="acc_gl_account" referencedColumnNames="id"/>
+    </changeSet>
+
+    <changeSet author="cbs-anshul" id="0600-2-investment-interest-permissions">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="0">SELECT COUNT(*) FROM m_permission WHERE code IN ('READ_INVESTMENTINTEREST', 'CREATE_INVESTMENTINTEREST', 'CREATE_INVESTMENTINTEREST_CHECKER')</sqlCheck>
+        </preConditions>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="READ_INVESTMENTINTEREST"/>
+            <column name="entity_name" value="INVESTMENTINTEREST"/>
+            <column name="action_name" value="READ"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="CREATE_INVESTMENTINTEREST"/>
+            <column name="entity_name" value="INVESTMENTINTEREST"/>
+            <column name="action_name" value="CREATE"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+        <insert tableName="m_permission">
+            <column name="grouping" value="portfolio"/>
+            <column name="code" value="CREATE_INVESTMENTINTEREST_CHECKER"/>
+            <column name="entity_name" value="INVESTMENTINTEREST"/>
+            <column name="action_name" value="CREATE_CHECKER"/>
+            <column name="can_maker_checker" valueBoolean="false"/>
+        </insert>
+    </changeSet>
+
+    <!-- Same roles as the other investment screens. -->
+    <changeSet author="cbs-anshul" id="0600-3-grant-investment-interest-permissions">
+        <sql>
+            INSERT INTO m_role_permission (role_id, permission_id)
+            SELECT rp.role_id, p.id
+            FROM m_role_permission rp
+            JOIN m_permission menu ON menu.id = rp.permission_id AND menu.code = 'MENU_INVESTMENT'
+            CROSS JOIN m_permission p
+            WHERE p.code IN ('READ_INVESTMENTINTEREST', 'CREATE_INVESTMENTINTEREST')
+              AND NOT EXISTS (SELECT 1 FROM m_role_permission x WHERE x.role_id = rp.role_id AND x.permission_id = p.id)
+        </sql>
+    </changeSet>
+</databaseChangeLog>

fineract-provider/src/test/java/org/apache/fineract/portfolio/investment/service/InvestmentInterestCalculatorTest.java

@@ -0,0 +1,173 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.investment.service;
+
+import static org.apache.fineract.portfolio.investment.service.InvestmentInterestCalculator.TYPE_COUPON;
+import static org.apache.fineract.portfolio.investment.service.InvestmentInterestCalculator.TYPE_PROVISION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import org.apache.fineract.portfolio.investment.service.InvestmentInterestCalculator.ScheduleRow;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Figures from Jitendra Sir's worked example: 7.50% GOI 2034, face value 1 crore, coupons 10 Feb / 10 Aug, bought on
+ * 08-10-2026.
+ */
+class InvestmentInterestCalculatorTest {
+
+    private static final BigDecimal ONE_CRORE = new BigDecimal("10000000");
+    private static final BigDecimal RATE = new BigDecimal("7.50");
+    private static final LocalDate MATURITY = LocalDate.of(2034, 8, 10);
+    private static final LocalDate LAST_COUPON = LocalDate.of(2026, 8, 10);
+    private static final LocalDate DEAL = LocalDate.of(2026, 10, 8);
+
+    @Test
+    void days360CountsEveryMonthAsThirtyDays() {
+        assertEquals(50, InvestmentInterestCalculator.days360(LAST_COUPON, LocalDate.of(2026, 9, 30)));
+        assertEquals(58, InvestmentInterestCalculator.days360(LAST_COUPON, DEAL));
+        assertEquals(90, InvestmentInterestCalculator.days360(LocalDate.of(2026, 6, 30), LocalDate.of(2026, 9, 30)));
+        assertEquals(50, InvestmentInterestCalculator.days360(LocalDate.of(2027, 2, 10), LocalDate.of(2027, 3, 31)));
+        assertEquals(180, InvestmentInterestCalculator.days360(LAST_COUPON, LocalDate.of(2027, 2, 10)));
+        assertEquals(360, InvestmentInterestCalculator.days360(LAST_COUPON, LocalDate.of(2027, 8, 10)));
+    }
+
+    @Test
+    void days360IsZeroWhenDatesAreMissingOrReversed() {
+        assertEquals(0, InvestmentInterestCalculator.days360(null, DEAL));
+        assertEquals(0, InvestmentInterestCalculator.days360(DEAL, null));
+        assertEquals(0, InvestmentInterestCalculator.days360(DEAL, DEAL));
+        assertEquals(0, InvestmentInterestCalculator.days360(DEAL, LAST_COUPON));
+    }
+
+    @Test
+    void interestForDaysRoundsToTheRupee() {
+        assertEquals(new BigDecimal("120833"), InvestmentInterestCalculator.interestForDays(ONE_CRORE, RATE, 58));
+        assertEquals(new BigDecimal("104167"), InvestmentInterestCalculator.interestForDays(ONE_CRORE, RATE, 50));
+        assertEquals(new BigDecimal("375000"), InvestmentInterestCalculator.interestForDays(ONE_CRORE, RATE, 180));
+    }
+
+    @Test
+    void halfYearCouponIsFaceValueTimesRateOverTwo() {
+        assertEquals(new BigDecimal("375000"), InvestmentInterestCalculator.halfYearCoupon(ONE_CRORE, RATE));
+        assertEquals(new BigDecimal("362500"), InvestmentInterestCalculator.halfYearCoupon(ONE_CRORE, new BigDecimal("7.25")));
+    }
+
+    @Test
+    void couponDatesRunSixMonthlyFromMaturity() {
+        assertEquals(LAST_COUPON, InvestmentInterestCalculator.lastCouponOnOrBefore(MATURITY, DEAL));
+        assertEquals(LAST_COUPON, InvestmentInterestCalculator.lastCouponOnOrBefore(MATURITY, LAST_COUPON));
+
+        final List<LocalDate> coupons = InvestmentInterestCalculator.couponDatesAfter(MATURITY, LAST_COUPON);
+        assertEquals(16, coupons.size());
+        assertEquals(LocalDate.of(2027, 2, 10), coupons.get(0));
+        assertEquals(LocalDate.of(2027, 8, 10), coupons.get(1));
+        assertEquals(MATURITY, coupons.get(15));
+    }
+
+    @Test
+    void monthEndMaturityKeepsMonthEndCoupons() {
+        final LocalDate maturity = LocalDate.of(2030, 8, 31);
+        final List<LocalDate> coupons = InvestmentInterestCalculator.couponDatesAfter(maturity, LocalDate.of(2029, 8, 31));
+        assertEquals(List.of(LocalDate.of(2030, 2, 28), maturity), coupons);
+    }
+
+    @Test
+    void closingDatesAreMarchAndSeptemberEnds() {
+        assertEquals(List.of(LocalDate.of(2027, 3, 31), LocalDate.of(2027, 9, 30)),
+                InvestmentInterestCalculator.closingDates(DEAL, LocalDate.of(2028, 3, 30)));
+        assertEquals(List.of(LocalDate.of(2026, 9, 30)),
+                InvestmentInterestCalculator.closingDates(LocalDate.of(2026, 9, 30), LocalDate.of(2026, 9, 30)));
+    }
+
+    @Test
+    void scheduleProvisionsAtEachClosingAndClearsAtTheCoupon() {
+        final List<ScheduleRow> rows = InvestmentInterestCalculator.schedule(ONE_CRORE, RATE, MATURITY, LAST_COUPON, DEAL);
+
+        // 16 coupons + 15 closings (Mar 2027 … Mar 2034); 30-09-2026 is before the deal, so it is the seller's.
+        assertEquals(31, rows.size());
+
+        // First coupon is income in full: the 1,20,833 paid to the seller was booked as an expense at purchase (RBI
+        // para 152).
+        assertRow(rows.get(0), TYPE_COUPON, LocalDate.of(2027, 2, 10), LocalDate.of(2026, 8, 11), 180, "375000", "0", "375000");
+        // 31 March closing: 50 days earned since 10 Feb, nothing booked yet.
+        assertRow(rows.get(1), TYPE_PROVISION, LocalDate.of(2027, 3, 31), LocalDate.of(2027, 2, 11), 50, "104167", "0", "104167");
+        // August coupon clears the March provision.
+        assertRow(rows.get(2), TYPE_COUPON, LocalDate.of(2027, 8, 10), LocalDate.of(2027, 2, 11), 180, "375000", "104167", "270833");
+        assertRow(rows.get(3), TYPE_PROVISION, LocalDate.of(2027, 9, 30), LocalDate.of(2027, 8, 11), 50, "104167", "0", "104167");
+
+        final ScheduleRow last = rows.get(rows.size() - 1);
+        assertEquals(TYPE_COUPON, last.type());
+        assertEquals(MATURITY, last.date());
+
+        // Over the life, income booked = all the coupons.
+        final BigDecimal totalIncome = rows.stream().map(ScheduleRow::amount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        assertEquals(new BigDecimal("375000").multiply(BigDecimal.valueOf(16)), totalIncome);
+    }
+
+    @Test
+    void closingOnACouponDateIsNotProvisionedTwice() {
+        // Coupons on 31 Mar / 30 Sep: every closing is a coupon day, so there are no provision lines.
+        final List<ScheduleRow> rows = InvestmentInterestCalculator.schedule(ONE_CRORE, RATE, LocalDate.of(2028, 3, 31),
+                LocalDate.of(2026, 9, 30), DEAL);
+        assertEquals(3, rows.size());
+        assertTrue(rows.stream().allMatch(r -> TYPE_COUPON.equals(r.type())));
+    }
+
+    @Test
+    void scheduleIsEmptyWithoutRateOrDates() {
+        assertTrue(InvestmentInterestCalculator.schedule(ONE_CRORE, BigDecimal.ZERO, MATURITY, LAST_COUPON, DEAL).isEmpty());
+        assertTrue(InvestmentInterestCalculator.schedule(ONE_CRORE, RATE, null, LAST_COUPON, DEAL).isEmpty());
+        assertTrue(InvestmentInterestCalculator.schedule(ONE_CRORE, RATE, MATURITY, null, DEAL).isEmpty());
+    }
+
+    @Test
+    void dealNumberFollowsTheAprilToMarchFinancialYear() {
+        assertEquals("202627", InvestmentPurchaseWritePlatformServiceImpl.dealNoPrefix(LocalDate.of(2026, 4, 1)));
+        assertEquals("202627", InvestmentPurchaseWritePlatformServiceImpl.dealNoPrefix(DEAL));
+        assertEquals("202627", InvestmentPurchaseWritePlatformServiceImpl.dealNoPrefix(LocalDate.of(2027, 3, 31)));
+        assertEquals("202728", InvestmentPurchaseWritePlatformServiceImpl.dealNoPrefix(LocalDate.of(2027, 4, 1)));
+        assertEquals("209900", InvestmentPurchaseWritePlatformServiceImpl.dealNoPrefix(LocalDate.of(2099, 12, 1)));
+    }
+
+    @Test
+    void approxYtmRisesWhenBoughtAtADiscount() {
+        final LocalDate issue = LocalDate.of(2024, 8, 10);
+        assertEquals(new BigDecimal("7.59"),
+                InvestmentPurchaseWritePlatformServiceImpl.approxYtm(RATE, new BigDecimal("99.50"), issue, MATURITY));
+        assertEquals(new BigDecimal("7.50"),
+                InvestmentPurchaseWritePlatformServiceImpl.approxYtm(RATE, new BigDecimal("100"), issue, MATURITY));
+        assertEquals(RATE, InvestmentPurchaseWritePlatformServiceImpl.approxYtm(RATE, new BigDecimal("99.50"), null, MATURITY));
+    }
+
+    private static void assertRow(final ScheduleRow row, final String type, final LocalDate date, final LocalDate from, final int days,
+            final String gross, final String alreadyBooked, final String amount) {
+        assertEquals(type, row.type());
+        assertEquals(date, row.date());
+        assertEquals(from, row.fromDate());
+        assertEquals(date, row.toDate());
+        assertEquals(days, row.days());
+        assertEquals(new BigDecimal(gross), row.grossInterest());
+        assertEquals(new BigDecimal(alreadyBooked), row.alreadyBooked());
+        assertEquals(new BigDecimal(amount), row.amount());
+    }
+}