diff --git a/src/app/core/shell/shell.component.ts b/src/app/core/shell/shell.component.ts
index e61129c1a..0ceee8562 100644
--- a/src/app/core/shell/shell.component.ts
+++ b/src/app/core/shell/shell.component.ts
@@ -98,6 +98,10 @@ export class ShellComponent implements OnInit, OnDestroy {
rbiMenuOpen = false;
rbiSearch = '';
+ /** Investment (Treasury) mega menu state */
+ investmentMenuOpen = false;
+ investmentSearch = '';
+
/* Live KPI ticker — markup is static inside the template; the marquee
animation, LIVE badge, and pause-on-hover handle the live feel. */
@@ -116,6 +120,11 @@ export class ShellComponent implements OnInit, OnDestroy {
return label.toLowerCase().includes(this.rbiSearch.toLowerCase());
}
+ matchesInvestmentSearch(label: string): boolean {
+ if (!this.investmentSearch) return true;
+ return label.toLowerCase().includes(this.investmentSearch.toLowerCase());
+ }
+
/** Route for a facility entry in the Account Facilities hover dropdown — only "Cheque Book" has a
* dedicated action page today; every other facility falls back to the existing overview page. */
facilityRoute(label: string): string[] {
@@ -312,7 +321,10 @@ export class ShellComponent implements OnInit, OnDestroy {
height: '100vh',
maxWidth: '100vw',
maxHeight: '100vh',
- panelClass: ['crr-slr-dialog-panel', 'fdrd-fullscreen-panel'],
+ panelClass: [
+ 'crr-slr-dialog-panel',
+ 'fdrd-fullscreen-panel'
+ ],
autoFocus: false,
disableClose: false,
hasBackdrop: true,
diff --git a/src/app/investment/bond-investment/bond-investment.component.html b/src/app/investment/bond-investment/bond-investment.component.html
new file mode 100644
index 000000000..10f310bd8
--- /dev/null
+++ b/src/app/investment/bond-investment/bond-investment.component.html
@@ -0,0 +1,1093 @@
+
+
+
+
+
+
TREASURY · INVESTMENT · GOVT SECURITY / NON-SLR / BOND / MUTUAL FUND
+
Govt. Security / Bond Entry
+
+ Purchase, Redemption, Interest Calculation, Sell, Write-off, Amortize, Yearly Amortize Process, GOI Category
+ Transfer, Investment Depreciation and Mutual Fund Transfer.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @if (activeTab === 'holdings') {
+
+
{{ instrumentLabel(bondType) }} Holdings Register
+
+
+
+ | Cert No |
+ Script |
+ Party |
+ Units |
+ Face Value |
+ Rate |
+ Purchase Date |
+ Maturity Date |
+ Accrued Interest |
+ Maturity Value |
+ Status |
+
+
+
+ @for (h of holdingsForType; track h.certNo) {
+
+ |
+ {{ h.certNo }}
+ |
+ {{ h.scriptName }} |
+ {{ h.party }} |
+ {{ h.units | number }} |
+ ₹{{ h.faceValue | number: '1.2-2' }} |
+ {{ h.interestRate }}% |
+ {{ h.purchaseDate }} |
+ {{ h.maturityDate }} |
+ ₹{{ accrued(h) | number: '1.2-2' }} |
+ ₹{{ maturity(h) | number: '1.2-2' }} |
+
+ {{ h.status }}
+ |
+
+ } @empty {
+
+ | No {{ instrumentLabel(bondType) }} holdings yet. |
+
+ }
+
+
+
+ }
+
+
+ @if (activeTab === 'purchase') {
+
+ }
+
+
+ @if (activeTab === 'redemption') {
+
+ }
+
+
+ @if (activeTab === 'interest') {
+
+
Investment - Govt./Bond Interest calculation
+
+
+
+
+
+
+
+
+
+
+
+
Holdings matching the filter ({{ intCalcTargets.length }})
+
+
+
+ | Cert No |
+ Script |
+ Type |
+ Rate |
+ Frequency |
+ Interest to Post |
+
+
+
+ @for (h of intCalcTargets; track h.certNo) {
+
+ |
+ {{ h.certNo }}
+ |
+ {{ h.scriptName }} |
+ {{ instrumentLabel(h.instrumentType) }} |
+ {{ h.interestRate }}% |
+ {{ h.interestFreq }} |
+ ₹{{ interestAccrued(h) | number: '1.2-2' }} |
+
+ } @empty {
+
+ | No holdings match the selected filters. |
+
+ }
+
+
+
+ }
+
+
+ @if (activeTab === 'sell') {
+
+ }
+
+
+ @if (activeTab === 'writeoff') {
+
+
Investment - Write Off Entry Gov/Bond
+
+
+ @if (writeoffHolding; as h) {
+
+ }
+
+
+
+
+
+
+
+ }
+
+
+ @if (activeTab === 'amortize') {
+
+ }
+
+
+ @if (activeTab === 'amortizeYearly') {
+
+ }
+
+
+ @if (activeTab === 'goiTransfer') {
+
+ }
+
+
+ @if (activeTab === 'depreciation') {
+
+ }
+
+
+ @if (activeTab === 'mfTransfer') {
+
+ }
+
+
+ @if (activeTab !== 'holdings') {
+
+
{{ instrumentLabel(bondType) }} Transaction Log
+
+
+
+ | Date |
+ Voucher No |
+ Cert No |
+ Type |
+ Particulars |
+ Amount |
+
+
+
+ @for (t of txnsForType; track t.voucherNo) {
+
+ | {{ t.txnDate }} |
+
+ {{ t.voucherNo }}
+ |
+ {{ t.certNo }} |
+ {{ t.txnType }} |
+ {{ t.particulars }} |
+ ₹{{ t.amount | number: '1.2-2' }} |
+
+ } @empty {
+
+ | No transactions yet. |
+
+ }
+
+
+
+ }
+
+
+
{{ toastMsg }}
diff --git a/src/app/investment/bond-investment/bond-investment.component.ts b/src/app/investment/bond-investment/bond-investment.component.ts
new file mode 100644
index 000000000..de971e980
--- /dev/null
+++ b/src/app/investment/bond-investment/bond-investment.component.ts
@@ -0,0 +1,1103 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import {
+ GOVT_SECURITY_HOLDINGS,
+ NON_SLR_HOLDINGS,
+ BOND_HOLDINGS,
+ MUTUAL_FUND_HOLDINGS,
+ ALL_TXNS,
+ SCRIPT_MASTER,
+ PARTY_MASTER,
+ SUBTYPE_MASTER,
+ BROKER_MASTER,
+ SGL_BANK_MASTER,
+ MUTUAL_FUND_PRODUCTS,
+ LIEN_REASON_MASTER,
+ CATEGORY_OPTIONS,
+ DEAL_TYPE_OPTIONS,
+ MARKET_OPTIONS,
+ PAYMENT_MODE_OPTIONS,
+ DELIVERY_MODE_OPTIONS,
+ BOND_RATING_OPTIONS,
+ INT_TYPE_OPTIONS,
+ AUTHORITY_OPTIONS,
+ InvestmentHolding,
+ InvestmentTxn,
+ InstrumentType,
+ InterestFreq,
+ INSTRUMENT_LABELS,
+ accruedInterest,
+ daysToMaturity,
+ maturityAmount,
+ addPeriod,
+ approxYtm,
+ yearsBetween,
+ todayDDMMYYYY
+} from '../investment-data';
+
+type BondType = 'GOVT_SECURITY' | 'NON_SLR' | 'BOND' | 'MUTUAL_FUND';
+type BondTab =
+ | 'holdings'
+ | 'purchase'
+ | 'redemption'
+ | 'interest'
+ | 'sell'
+ | 'writeoff'
+ | 'amortize'
+ | 'amortizeYearly'
+ | 'goiTransfer'
+ | 'depreciation'
+ | 'mfTransfer';
+
+interface BondPurchaseForm {
+ bondType: BondType;
+ dealNo: string;
+ dealDate: string;
+ dealTime: string;
+ isin: string;
+ scriptCode: string;
+ certNo: string;
+ settlementType: 'T+0' | 'T+1' | 'T+2';
+ settlementDt: string;
+ faceValue: number | null;
+ purchaseRate: number | null;
+ partyCode: string;
+ subType: string;
+ tbillGlAc: string;
+ crToAc: string;
+ premiumAmt: number | null;
+ brokerage: number | null;
+ brokerName: string;
+ tradeNo: string;
+ orderNo: string;
+ recommAuthority: string;
+ sanctionAuthority: string;
+ issueDate: string;
+ periodYear: number | null;
+ periodMonth: number | null;
+ periodDays: number | null;
+ descInv: string;
+ folioNo: string;
+ callOption: string;
+ meetDt: string;
+ resoNo: string;
+ fromDist: string;
+ toDist: string;
+ redumMatDt: string;
+ category: string;
+ intRate: number | null;
+ intType: InterestFreq;
+ intDate: string;
+ lastIntDt: string;
+ dealType: string;
+ market: string;
+ markCblo: 'YES' | 'NO';
+ amortizeAmt: number | null;
+ remarks: string;
+ lien: 'YES' | 'NO';
+ lienAmount: number | null;
+ lienReason: string;
+ deliveryMode: string;
+ bondRating: string;
+ corpBond: 'YES' | 'NO';
+ paymentMode: string;
+ sglWithBank: string;
+ description: string;
+ registerAdd: string;
+ regiCity: string;
+ regiPin: string;
+ // Mutual Fund specific
+ productName: string;
+ considerAmt: number | null;
+ tradeAmt: number | null;
+ nav: number | null;
+ holdingDays: number | null;
+ stampDuty: number | null;
+ stampDutyAc: string;
+}
+
+interface BondSellForm {
+ /** Legacy screen has SELL / REDEEM / MUTUAL FUND SELL radio at the top. */
+ mode: 'SELL' | 'REDEEM' | 'MUTUAL_FUND_SELL';
+ /** Purchase Search — locate the original purchase by Deal No or ISIN No. */
+ searchBy: 'DEAL_NO' | 'ISIN_NO';
+ searchValue: string;
+ bondType: BondType;
+ scriptCode: string;
+ certNo: string;
+ buyerCode: string;
+ subType: string;
+ isin: string;
+ tbillGlAc: string;
+ dealDate: string;
+ dealTime: string;
+ settlementType: 'T+0' | 'T+1' | 'T+2';
+ settlementDt: string;
+ faceValue: number | null;
+ sellRate: number | null;
+ tdsAmt: number | null;
+ unitVal: number | null;
+ payAmt: number | null;
+ sellUnit: number | null;
+ brokerage: number | null;
+ dbToAc: string;
+ amortizeAmt: number | null;
+ recommAuthority: string;
+ sanctionAuthority: string;
+ callMoney: boolean;
+}
+
+/**
+ * Combined Govt Security / Non-SLR / Bond / Mutual Fund treasury screen, mirroring the legacy
+ * "03 Govt./Bond Entry" submenu in full: Purchase, Redemption, Interest Calculation, Sell,
+ * Write-off, Amortize, Amortize Yearly Process, GOI Category Transfer, Investment Depreciation
+ * and Mutual Fund Transfer. Dummy in-memory data; Save appends to the local arrays.
+ */
+@Component({
+ selector: 'mifosx-bond-investment',
+ templateUrl: './bond-investment.component.html',
+ styleUrls: [
+ '../../cashier/cashier-shared.scss',
+ '../investment-shared.scss'
+ ],
+ standalone: true,
+ imports: [
+ CommonModule,
+ FormsModule
+ ]
+})
+export class BondInvestmentComponent {
+ activeTab: BondTab = 'holdings';
+ bondType: BondType = 'GOVT_SECURITY';
+ asOnDate = todayDDMMYYYY();
+
+ holdings: InvestmentHolding[] = [
+ ...GOVT_SECURITY_HOLDINGS,
+ ...NON_SLR_HOLDINGS,
+ ...BOND_HOLDINGS,
+ ...MUTUAL_FUND_HOLDINGS
+ ];
+ txns: InvestmentTxn[] = ALL_TXNS.filter((t) => ([
+ 'GOVT_SECURITY',
+ 'NON_SLR',
+ 'BOND',
+ 'MUTUAL_FUND'
+ ] as InstrumentType[]).includes(t.instrumentType));
+
+ // Master-driven dropdown sources
+ readonly scriptOptions = SCRIPT_MASTER;
+ readonly partyOptions = PARTY_MASTER;
+ readonly subTypeOptions = SUBTYPE_MASTER;
+ readonly brokerOptions = BROKER_MASTER;
+ readonly sglBankOptions = SGL_BANK_MASTER;
+ readonly mfProductOptions = MUTUAL_FUND_PRODUCTS;
+ readonly lienReasonOptions = LIEN_REASON_MASTER;
+ readonly categoryOptions = CATEGORY_OPTIONS;
+ readonly dealTypeOptions = DEAL_TYPE_OPTIONS;
+ readonly marketOptions = MARKET_OPTIONS;
+ readonly paymentModeOptions = PAYMENT_MODE_OPTIONS;
+ readonly deliveryModeOptions = DELIVERY_MODE_OPTIONS;
+ readonly bondRatingOptions = BOND_RATING_OPTIONS;
+ readonly intTypeOptions = INT_TYPE_OPTIONS;
+ readonly authorityOptions = AUTHORITY_OPTIONS;
+
+ toastMsg = '';
+ toastVisible = false;
+ private toastTimer: ReturnType
| undefined;
+
+ purchaseForm: BondPurchaseForm = this.blankPurchaseForm();
+ sellForm: BondSellForm = this.blankSellForm();
+
+ // Redemption Entry
+ redeemCertNo = '';
+ redeemDate = this.asOnDate;
+ redeemRemarks = '';
+
+ // Interest Calculation (legacy: Date / Type / Script / Deal No / ALL + Process)
+ intCalcDate = this.asOnDate;
+ intCalcType: BondType | '' = '';
+ intCalcScript = '';
+ intCalcDealNo = '';
+ intCalcAll = false;
+
+ // Write-off
+ writeoffCertNo = '';
+ writeoffReason = '';
+
+ // Amortize
+ amortizeCertNo = '';
+ amortizeAmt: number | null = null;
+
+ // Amortize Yearly Process
+ amortizeYear = String(new Date().getFullYear());
+
+ // GOI Category Transfer
+ goiCertNo = '';
+ goiFromCategory = '';
+ goiToCategory = '';
+ goiTransferDate = this.asOnDate;
+
+ // Investment Depreciation
+ depreciationDate = this.asOnDate;
+ depreciationCategory = '';
+
+ // Mutual Fund Transfer
+ mfFromCertNo = '';
+ mfToProduct = '';
+ mfTransferUnits: number | null = null;
+ mfTransferDate = this.asOnDate;
+
+ readonly bondTypeOptions: Array<{ value: BondType; label: string }> = [
+ { value: 'GOVT_SECURITY', label: 'GOVT SECURITY' },
+ { value: 'NON_SLR', label: 'NON SLR' },
+ { value: 'BOND', label: 'BOND' },
+ { value: 'MUTUAL_FUND', label: 'MUTUAL FUND' }
+ ];
+
+ setTab(tab: BondTab): void {
+ this.activeTab = tab;
+ }
+
+ setBondType(type: BondType): void {
+ this.bondType = type;
+ this.purchaseForm.bondType = type;
+ }
+
+ get holdingsForType(): InvestmentHolding[] {
+ return this.holdings.filter((h) => h.instrumentType === this.bondType);
+ }
+
+ get activeHoldingsForType(): InvestmentHolding[] {
+ return this.holdingsForType.filter((h) => h.status === 'ACTIVE');
+ }
+
+ get txnsForType(): InvestmentTxn[] {
+ return this.txns.filter((t) => t.instrumentType === this.bondType);
+ }
+
+ get scriptsForType(): typeof SCRIPT_MASTER {
+ return this.scriptOptions.filter((s) => s.instrumentType === this.purchaseForm.bondType);
+ }
+
+ instrumentLabel(type: InstrumentType): string {
+ return INSTRUMENT_LABELS[type];
+ }
+
+ private nextDealNo(): string {
+ return `2026${String(27000039 + this.holdings.length).padStart(9, '0')}`;
+ }
+
+ private blankPurchaseForm(): BondPurchaseForm {
+ const type = this.bondType ?? 'GOVT_SECURITY';
+ return {
+ bondType: type,
+ dealNo: this.nextDealNo(),
+ dealDate: this.asOnDate,
+ dealTime: '',
+ isin: '',
+ scriptCode: '',
+ certNo: '',
+ settlementType: 'T+0',
+ settlementDt: this.asOnDate,
+ faceValue: null,
+ purchaseRate: 100,
+ partyCode: '',
+ subType: type === 'GOVT_SECURITY' ? 'SLR' : type === 'NON_SLR' ? 'NON SLR' : 'CORPORATE BOND',
+ tbillGlAc: '',
+ crToAc: '310070',
+ premiumAmt: null,
+ brokerage: null,
+ brokerName: '',
+ tradeNo: '',
+ orderNo: '',
+ recommAuthority: '',
+ sanctionAuthority: '',
+ issueDate: this.asOnDate,
+ periodYear: 3,
+ periodMonth: 0,
+ periodDays: 0,
+ descInv: '',
+ folioNo: '',
+ callOption: '',
+ meetDt: '',
+ resoNo: '',
+ fromDist: '',
+ toDist: '',
+ redumMatDt: '',
+ category: '',
+ intRate: null,
+ intType: 'HALF_YEARLY',
+ intDate: this.asOnDate,
+ lastIntDt: this.asOnDate,
+ dealType: 'OUTRIGHT',
+ market: 'NDS-OM',
+ markCblo: 'NO',
+ amortizeAmt: null,
+ remarks: '',
+ lien: 'NO',
+ lienAmount: null,
+ lienReason: '',
+ deliveryMode: '',
+ bondRating: type === 'GOVT_SECURITY' ? 'SOVEREIGN' : 'AAA',
+ corpBond: type === 'BOND' ? 'YES' : 'NO',
+ paymentMode: '',
+ sglWithBank: '',
+ description: '',
+ registerAdd: '',
+ regiCity: '',
+ regiPin: '',
+ productName: '',
+ considerAmt: null,
+ tradeAmt: null,
+ nav: null,
+ holdingDays: null,
+ stampDuty: null,
+ stampDutyAc: ''
+ };
+ }
+
+ private blankSellForm(): BondSellForm {
+ return {
+ mode: 'SELL',
+ searchBy: 'DEAL_NO',
+ searchValue: '',
+ bondType: this.bondType ?? 'GOVT_SECURITY',
+ scriptCode: '',
+ certNo: '',
+ buyerCode: '',
+ subType: '',
+ isin: '',
+ tbillGlAc: '',
+ dealDate: this.asOnDate,
+ dealTime: '',
+ settlementType: 'T+0',
+ settlementDt: this.asOnDate,
+ faceValue: null,
+ sellRate: null,
+ tdsAmt: null,
+ unitVal: 100,
+ payAmt: null,
+ sellUnit: null,
+ brokerage: null,
+ dbToAc: '310070',
+ amortizeAmt: null,
+ recommAuthority: '',
+ sanctionAuthority: '',
+ callMoney: false
+ };
+ }
+
+ get isMutualFund(): boolean {
+ return this.purchaseForm.bondType === 'MUTUAL_FUND';
+ }
+
+ /** Face value for the purchase — Mutual Fund screens label it "Consider Amt" instead. */
+ get purchaseBaseAmount(): number {
+ const f = this.purchaseForm;
+ return (this.isMutualFund ? f.considerAmt : f.faceValue) || 0;
+ }
+
+ get purchaseMaturityDate(): string {
+ const f = this.purchaseForm;
+ if (f.redumMatDt) {
+ return f.redumMatDt;
+ }
+ if (!f.issueDate) {
+ return '';
+ }
+ return addPeriod(f.issueDate, f.periodYear || 0, f.periodMonth || 0, f.periodDays || 0);
+ }
+
+ get purchaseUnits(): number {
+ const f = this.purchaseForm;
+ const amt = this.purchaseBaseAmount;
+ if (this.isMutualFund) {
+ return f.nav ? +(amt / f.nav).toFixed(3) : 0;
+ }
+ return f.purchaseRate ? Math.round((amt / f.purchaseRate) * (f.purchaseRate / 100)) : 0;
+ }
+
+ /** Unit Val — the per-unit face value used by the legacy form (100 for G-Sec/Bonds, NAV for MF). */
+ get purchaseUnitVal(): number {
+ return this.isMutualFund ? this.purchaseForm.nav || 0 : 100;
+ }
+
+ /** Book Value — what the investment is carried at, i.e. amount actually paid. */
+ get purchaseBookValue(): number {
+ const f = this.purchaseForm;
+ if (this.isMutualFund) {
+ return this.purchaseBaseAmount + (f.stampDuty || 0) + (f.brokerage || 0);
+ }
+ const rate = f.purchaseRate || 100;
+ return Math.round((this.purchaseBaseAmount * rate) / 100) + (f.brokerage || 0);
+ }
+
+ get purchaseYtm(): number {
+ const f = this.purchaseForm;
+ if (!f.intRate || !this.purchaseMaturityDate) {
+ return 0;
+ }
+ return approxYtm(f.intRate, f.purchaseRate || 100, yearsBetween(f.issueDate, this.purchaseMaturityDate));
+ }
+
+ /** Accrued Interest at purchase — interest earned by the seller since the last coupon date. */
+ get purchaseAccruedInterest(): number {
+ const f = this.purchaseForm;
+ if (!f.intRate || !f.lastIntDt || !f.dealDate) {
+ return 0;
+ }
+ const yrs = Math.max(0, yearsBetween(f.lastIntDt, f.dealDate));
+ return Math.round(this.purchaseBaseAmount * (f.intRate / 100) * yrs);
+ }
+
+ /** Settlement Amt of Purchase — book value plus accrued interest payable to the seller. */
+ get purchaseSettlementAmount(): number {
+ return this.purchaseBookValue + this.purchaseAccruedInterest;
+ }
+
+ get purchaseMaturityAmount(): number {
+ const f = this.purchaseForm;
+ if (!this.purchaseBaseAmount || !this.purchaseMaturityDate) {
+ return this.purchaseBaseAmount;
+ }
+ return maturityAmount({
+ certNo: f.certNo,
+ instrumentType: f.bondType,
+ scriptCode: f.scriptCode,
+ scriptName: '',
+ party: f.partyCode,
+ subType: f.subType,
+ faceValue: this.purchaseBaseAmount,
+ purchaseRate: f.purchaseRate || 100,
+ units: this.purchaseUnits,
+ purchaseDate: f.issueDate,
+ maturityDate: this.purchaseMaturityDate,
+ interestRate: f.intRate || 0,
+ interestFreq: this.isMutualFund ? 'CUMULATIVE' : f.intType,
+ glCode: '',
+ glName: '',
+ crToAc: f.crToAc,
+ brokerCode: f.brokerName,
+ status: 'ACTIVE'
+ });
+ }
+
+ /** Fills ISIN + interest rate when a script is picked, mirroring the legacy form's lookup. */
+ onScriptChange(): void {
+ const s = this.scriptOptions.find((x) => x.scriptCode === this.purchaseForm.scriptCode);
+ if (s) {
+ this.purchaseForm.isin = s.isin;
+ }
+ }
+
+ savePurchase(): void {
+ const f = this.purchaseForm;
+ if (!f.certNo || !this.purchaseBaseAmount || !f.partyCode) {
+ this.toast('Please fill Cert No, Face Value / Consider Amt and Party Code.');
+ return;
+ }
+ const holding: InvestmentHolding = {
+ certNo: f.certNo,
+ instrumentType: f.bondType,
+ scriptCode: f.scriptCode || f.isin || f.productName,
+ scriptName: this.isMutualFund
+ ? f.productName
+ : this.scriptOptions.find((s) => s.scriptCode === f.scriptCode)?.scriptName || f.scriptCode || f.isin,
+ party: f.partyCode,
+ subType: f.subType,
+ faceValue: this.purchaseBaseAmount,
+ purchaseRate: this.isMutualFund ? f.nav || 0 : f.purchaseRate || 100,
+ units: this.purchaseUnits,
+ purchaseDate: f.issueDate,
+ maturityDate: this.purchaseMaturityDate || f.issueDate,
+ interestRate: f.intRate || 0,
+ interestFreq: this.isMutualFund ? 'CUMULATIVE' : f.intType,
+ glCode:
+ '31' +
+ (f.bondType === 'GOVT_SECURITY'
+ ? '0020'
+ : f.bondType === 'NON_SLR'
+ ? '0030'
+ : f.bondType === 'BOND'
+ ? '0040'
+ : '0050'),
+ glName: `INVESTMENT IN ${INSTRUMENT_LABELS[f.bondType].toUpperCase()}`,
+ crToAc: f.crToAc,
+ brokerCode: f.brokerName,
+ status: 'ACTIVE'
+ };
+ this.holdings = [
+ holding,
+ ...this.holdings
+ ];
+ this.txns = [
+ {
+ certNo: holding.certNo,
+ instrumentType: f.bondType,
+ txnType: 'PURCHASE',
+ voucherNo: `INV/PUR/${f.dealNo}`,
+ txnDate: f.dealDate,
+ amount: this.purchaseSettlementAmount,
+ particulars: `Purchase Deal ${f.dealNo} - ${holding.scriptName} - ${holding.party}${f.category ? ' [' + f.category + ']' : ''}`
+ },
+ ...this.txns
+ ];
+ this.toast(`${INSTRUMENT_LABELS[f.bondType]} Certificate ${holding.certNo} saved successfully.`);
+ this.purchaseForm = this.blankPurchaseForm();
+ this.activeTab = 'holdings';
+ }
+
+ cancelPurchase(): void {
+ this.purchaseForm = this.blankPurchaseForm();
+ this.toast('Entry cancelled — form reset.');
+ }
+
+ /** Legacy "Retrieve" button — loads an existing deal back into the form by Cert No. */
+ retrievePurchase(): void {
+ const h = this.holdings.find((x) => x.certNo === this.purchaseForm.certNo.trim());
+ if (!h) {
+ this.toast(`Cert No ${this.purchaseForm.certNo} not found.`);
+ return;
+ }
+ this.purchaseForm = {
+ ...this.blankPurchaseForm(),
+ bondType: h.instrumentType as BondType,
+ certNo: h.certNo,
+ scriptCode: h.scriptCode,
+ isin: this.scriptOptions.find((s) => s.scriptCode === h.scriptCode)?.isin || '',
+ partyCode: h.party,
+ subType: h.subType,
+ faceValue: h.faceValue,
+ considerAmt: h.faceValue,
+ purchaseRate: h.purchaseRate,
+ nav: h.purchaseRate,
+ issueDate: h.purchaseDate,
+ redumMatDt: h.maturityDate,
+ intRate: h.interestRate,
+ intType: h.interestFreq,
+ brokerName: h.brokerCode,
+ crToAc: h.crToAc,
+ productName: h.scriptName
+ };
+ this.bondType = h.instrumentType as BondType;
+ this.toast(`Deal for Cert No ${h.certNo} retrieved.`);
+ }
+
+ dropPurchase(): void {
+ const certNo = this.purchaseForm.certNo;
+ if (!this.holdings.some((h) => h.certNo === certNo)) {
+ this.toast('Nothing to drop — this deal is not yet saved.');
+ return;
+ }
+ this.holdings = this.holdings.filter((h) => h.certNo !== certNo);
+ this.txns = this.txns.filter((t) => t.certNo !== certNo);
+ this.purchaseForm = this.blankPurchaseForm();
+ this.toast(`Cert No ${certNo} dropped.`);
+ }
+
+ exitPurchase(): void {
+ this.purchaseForm = this.blankPurchaseForm();
+ this.activeTab = 'holdings';
+ }
+
+ // -------------------- Redemption Entry --------------------
+ get redeemHolding(): InvestmentHolding | undefined {
+ return this.holdingsForType.find((h) => h.certNo === this.redeemCertNo);
+ }
+
+ get redeemAmount(): number {
+ const h = this.redeemHolding;
+ return h ? maturityAmount(h) + accruedInterest(h, this.redeemDate) - h.faceValue + h.faceValue : 0;
+ }
+
+ saveRedemption(): void {
+ const h = this.redeemHolding;
+ if (!h) {
+ this.toast('Select a certificate to redeem.');
+ return;
+ }
+ h.status = 'MATURED';
+ this.txns = [
+ {
+ certNo: h.certNo,
+ instrumentType: h.instrumentType,
+ txnType: 'REDEEM',
+ voucherNo: `INV/RED/${h.certNo}`,
+ txnDate: this.redeemDate,
+ amount: this.redeemAmount,
+ particulars: `Redemption on maturity - ${h.scriptName}${this.redeemRemarks ? ' - ' + this.redeemRemarks : ''}`
+ },
+ ...this.txns
+ ];
+ this.toast(`${h.certNo} redeemed. Proceeds ₹${this.redeemAmount.toLocaleString('en-IN')}.`);
+ this.redeemCertNo = '';
+ this.redeemRemarks = '';
+ this.activeTab = 'holdings';
+ }
+
+ // -------------------- Interest calculation --------------------
+ /** Holdings the Interest Calculation "Process" run would cover, given the filters. */
+ get intCalcTargets(): InvestmentHolding[] {
+ if (this.intCalcAll) {
+ return this.holdings.filter((h) => h.status === 'ACTIVE');
+ }
+ return this.holdings.filter((h) => {
+ if (h.status !== 'ACTIVE') return false;
+ if (this.intCalcType && h.instrumentType !== this.intCalcType) return false;
+ if (this.intCalcScript && h.scriptCode !== this.intCalcScript) return false;
+ if (this.intCalcDealNo && h.certNo !== this.intCalcDealNo.trim()) return false;
+ return true;
+ });
+ }
+
+ interestAccrued(h: InvestmentHolding): number {
+ return accruedInterest(h, this.intCalcDate || this.asOnDate);
+ }
+
+ processInterest(): void {
+ const targets = this.intCalcTargets;
+ if (targets.length === 0) {
+ this.toast('No holdings match the selected filters.');
+ return;
+ }
+ const newTxns: InvestmentTxn[] = targets.map((h, i) => ({
+ certNo: h.certNo,
+ instrumentType: h.instrumentType,
+ txnType: 'INTEREST',
+ voucherNo: `INV/INT/${h.certNo}-${this.txns.length + i + 1}`,
+ txnDate: this.intCalcDate || this.asOnDate,
+ amount: this.interestAccrued(h),
+ particulars: `Interest calculated - ${h.scriptName}`
+ }));
+ this.txns = [
+ ...newTxns,
+ ...this.txns
+ ];
+ const total = newTxns.reduce((s, t) => s + t.amount, 0);
+ this.toast(`Interest processed for ${targets.length} holding(s). Total ₹${total.toLocaleString('en-IN')}.`);
+ }
+
+ // -------------------- Sell / Redeem Entry --------------------
+ /** Locates the original purchase by Deal No / Cert No or ISIN and fills the sell form. */
+ searchPurchaseForSell(): void {
+ const val = this.sellForm.searchValue.trim();
+ if (!val) {
+ this.toast('Enter a Deal No / Cert No or ISIN to search.');
+ return;
+ }
+ const h =
+ this.sellForm.searchBy === 'DEAL_NO'
+ ? this.holdings.find((x) => x.certNo === val)
+ : this.holdings.find((x) => this.scriptOptions.find((s) => s.scriptCode === x.scriptCode)?.isin === val);
+ if (!h) {
+ this.toast('No matching purchase found.');
+ return;
+ }
+ this.sellForm = {
+ ...this.sellForm,
+ bondType: h.instrumentType as BondType,
+ scriptCode: h.scriptCode,
+ certNo: h.certNo,
+ subType: h.subType,
+ isin: this.scriptOptions.find((s) => s.scriptCode === h.scriptCode)?.isin || '',
+ faceValue: h.faceValue,
+ unitVal: h.instrumentType === 'MUTUAL_FUND' ? h.purchaseRate : 100,
+ sellUnit: h.units
+ };
+ this.toast(`Purchase ${h.certNo} loaded.`);
+ }
+
+ get sellHolding(): InvestmentHolding | undefined {
+ return this.holdings.find((h) => h.certNo === this.sellForm.certNo);
+ }
+
+ /** Consideration = units sold × sell rate, scaled by the instrument's unit convention. */
+ get sellConsideration(): number {
+ const f = this.sellForm;
+ if (!f.sellUnit || !f.sellRate) {
+ return 0;
+ }
+ const perUnitDivisor = f.mode === 'MUTUAL_FUND_SELL' ? 1 : 100;
+ return Math.round((f.sellUnit * f.sellRate) / perUnitDivisor);
+ }
+
+ /** Sale Diff — profit/loss versus what the holding was bought at. */
+ get sellSaleDiff(): number {
+ const h = this.sellHolding;
+ const f = this.sellForm;
+ if (!h || !f.sellUnit || !f.sellRate) {
+ return 0;
+ }
+ const perUnitDivisor = f.mode === 'MUTUAL_FUND_SELL' ? 1 : 100;
+ const cost = Math.round((f.sellUnit * h.purchaseRate) / perUnitDivisor);
+ return this.sellConsideration - cost;
+ }
+
+ /** Premium Loss — the unamortised premium written off when a holding is sold early. */
+ get sellPremiumLoss(): number {
+ const h = this.sellHolding;
+ if (!h || h.purchaseRate <= 100 || h.instrumentType === 'MUTUAL_FUND') {
+ return 0;
+ }
+ return Math.round((h.faceValue * (h.purchaseRate - 100)) / 100);
+ }
+
+ get sellAccruedInterest(): number {
+ const h = this.sellHolding;
+ return h ? accruedInterest(h, this.sellForm.dealDate || this.asOnDate) : 0;
+ }
+
+ get sellAccruedDays(): number {
+ const h = this.sellHolding;
+ if (!h) {
+ return 0;
+ }
+ return Math.max(0, Math.round(yearsBetween(h.purchaseDate, this.sellForm.dealDate || this.asOnDate) * 365));
+ }
+
+ /** Pay Amt — net amount receivable: consideration + accrued interest − TDS − brokerage. */
+ get sellPayAmount(): number {
+ const f = this.sellForm;
+ return this.sellConsideration + this.sellAccruedInterest - (f.tdsAmt || 0) - (f.brokerage || 0);
+ }
+
+ saveSell(): void {
+ const f = this.sellForm;
+ const h = this.sellHolding;
+ if (!h || !f.sellRate || !f.sellUnit) {
+ this.toast('Load a purchase, then enter Sell Rate and Sell Unit.');
+ return;
+ }
+ if (f.sellUnit > h.units) {
+ this.toast(`Sell Unit cannot exceed units held (${h.units}).`);
+ return;
+ }
+ h.units -= f.sellUnit;
+ h.faceValue = Math.round(h.units * (f.unitVal || 100));
+ if (h.units <= 0) {
+ h.status = f.mode === 'REDEEM' ? 'MATURED' : 'SOLD';
+ }
+ this.txns = [
+ {
+ certNo: h.certNo,
+ instrumentType: h.instrumentType,
+ txnType: f.mode === 'REDEEM' ? 'REDEEM' : 'SELL',
+ voucherNo: `INV/${f.mode === 'REDEEM' ? 'RED' : 'SEL'}/${h.certNo}-${this.txns.length + 1}`,
+ txnDate: f.dealDate,
+ amount: this.sellPayAmount,
+ particulars: `${f.mode.replace(/_/g, ' ')} - ${h.scriptName} @ ${f.sellRate}${f.buyerCode ? ' to ' + f.buyerCode : ''}${f.callMoney ? ' [CALL MONEY]' : ''}`
+ },
+ ...this.txns
+ ];
+ this.toast(
+ `${h.certNo} ${f.mode === 'REDEEM' ? 'redeemed' : 'sold'}. Pay Amt ₹${this.sellPayAmount.toLocaleString('en-IN')}.`
+ );
+ this.sellForm = this.blankSellForm();
+ this.activeTab = 'holdings';
+ }
+
+ cancelSell(): void {
+ this.sellForm = this.blankSellForm();
+ this.toast('Sell entry cancelled — form reset.');
+ }
+
+ exitSell(): void {
+ this.sellForm = this.blankSellForm();
+ this.activeTab = 'holdings';
+ }
+
+ // -------------------- Write-off --------------------
+ get writeoffHolding(): InvestmentHolding | undefined {
+ return this.holdingsForType.find((h) => h.certNo === this.writeoffCertNo);
+ }
+
+ saveWriteoff(): void {
+ const h = this.writeoffHolding;
+ if (!h || !this.writeoffReason) {
+ this.toast('Select a certificate and enter a write-off reason.');
+ return;
+ }
+ h.status = 'WRITTEN_OFF';
+ this.txns = [
+ {
+ certNo: h.certNo,
+ instrumentType: h.instrumentType,
+ txnType: 'WRITE_OFF',
+ voucherNo: `INV/WOF/${h.certNo}`,
+ txnDate: this.asOnDate,
+ amount: h.faceValue,
+ particulars: `Written off - ${this.writeoffReason}`
+ },
+ ...this.txns
+ ];
+ this.toast(`${h.certNo} written off.`);
+ this.writeoffCertNo = '';
+ this.writeoffReason = '';
+ this.activeTab = 'holdings';
+ }
+
+ // -------------------- Amortize --------------------
+ get amortizeHolding(): InvestmentHolding | undefined {
+ return this.holdingsForType.find((h) => h.certNo === this.amortizeCertNo);
+ }
+
+ /** Straight-line premium amortisation for one year on the selected holding. */
+ get suggestedAmortizeAmt(): number {
+ const h = this.amortizeHolding;
+ if (!h || h.purchaseRate <= 100) {
+ return 0;
+ }
+ const years = Math.max(1, yearsBetween(h.purchaseDate, h.maturityDate));
+ return Math.round((h.faceValue * (h.purchaseRate - 100)) / 100 / years);
+ }
+
+ saveAmortize(): void {
+ const h = this.amortizeHolding;
+ const amt = this.amortizeAmt ?? this.suggestedAmortizeAmt;
+ if (!h || !amt) {
+ this.toast('Select a certificate and enter the amortization amount.');
+ return;
+ }
+ this.txns = [
+ {
+ certNo: h.certNo,
+ instrumentType: h.instrumentType,
+ txnType: 'AMORTIZE',
+ voucherNo: `INV/AMZ/${h.certNo}-${this.txns.length + 1}`,
+ txnDate: this.asOnDate,
+ amount: amt,
+ particulars: `Premium/discount amortized - ${h.scriptName}`
+ },
+ ...this.txns
+ ];
+ this.toast(`Amortization of ₹${amt.toLocaleString('en-IN')} booked for ${h.certNo}.`);
+ this.amortizeCertNo = '';
+ this.amortizeAmt = null;
+ }
+
+ // -------------------- Amortize Yearly Process --------------------
+ /** All premium-carrying holdings the yearly batch would amortise. */
+ get amortizeYearlyTargets(): Array<{ holding: InvestmentHolding; amount: number }> {
+ return this.holdings
+ .filter((h) => h.status === 'ACTIVE' && h.purchaseRate > 100 && h.instrumentType !== 'MUTUAL_FUND')
+ .map((h) => {
+ const years = Math.max(1, yearsBetween(h.purchaseDate, h.maturityDate));
+ return { holding: h, amount: Math.round((h.faceValue * (h.purchaseRate - 100)) / 100 / years) };
+ });
+ }
+
+ get amortizeYearlyTotal(): number {
+ return this.amortizeYearlyTargets.reduce((s, t) => s + t.amount, 0);
+ }
+
+ runAmortizeYearly(): void {
+ const targets = this.amortizeYearlyTargets;
+ if (targets.length === 0) {
+ this.toast('No premium-carrying holdings to amortise.');
+ return;
+ }
+ const newTxns: InvestmentTxn[] = targets.map((t, i) => ({
+ certNo: t.holding.certNo,
+ instrumentType: t.holding.instrumentType,
+ txnType: 'AMORTIZE',
+ voucherNo: `INV/AMZ-YR/${this.amortizeYear}-${i + 1}`,
+ txnDate: this.asOnDate,
+ amount: t.amount,
+ particulars: `Yearly amortization process ${this.amortizeYear} - ${t.holding.scriptName}`
+ }));
+ this.txns = [
+ ...newTxns,
+ ...this.txns
+ ];
+ this.toast(
+ `Yearly amortization run for ${targets.length} holding(s). Total ₹${this.amortizeYearlyTotal.toLocaleString('en-IN')}.`
+ );
+ }
+
+ // -------------------- GOI Category Transfer --------------------
+ get goiHolding(): InvestmentHolding | undefined {
+ return this.holdings.find((h) => h.certNo === this.goiCertNo);
+ }
+
+ saveGoiTransfer(): void {
+ const h = this.goiHolding;
+ if (!h || !this.goiFromCategory || !this.goiToCategory) {
+ this.toast('Select a certificate and both From / To categories.');
+ return;
+ }
+ if (this.goiFromCategory === this.goiToCategory) {
+ this.toast('From and To categories must differ.');
+ return;
+ }
+ this.txns = [
+ {
+ certNo: h.certNo,
+ instrumentType: h.instrumentType,
+ txnType: 'AMORTIZE',
+ voucherNo: `INV/GOI-TRF/${h.certNo}-${this.txns.length + 1}`,
+ txnDate: this.goiTransferDate,
+ amount: h.faceValue,
+ particulars: `GOI category transfer ${this.goiFromCategory} → ${this.goiToCategory} - ${h.scriptName}`
+ },
+ ...this.txns
+ ];
+ this.toast(`${h.certNo} transferred from ${this.goiFromCategory} to ${this.goiToCategory}.`);
+ this.goiCertNo = '';
+ this.goiFromCategory = '';
+ this.goiToCategory = '';
+ }
+
+ // -------------------- Investment Depreciation --------------------
+ /** AFS/HFT holdings whose market price is below book value must be marked down (RBI norms). */
+ get depreciationTargets(): Array<{ holding: InvestmentHolding; marketPrice: number; depreciation: number }> {
+ return this.holdings
+ .filter((h) => h.status === 'ACTIVE' && h.instrumentType !== 'MUTUAL_FUND')
+ .map((h) => {
+ const md = this.scriptOptions.find((s) => s.scriptCode === h.scriptCode);
+ const marketPrice = md ? h.purchaseRate * 0.995 : h.purchaseRate;
+ const depreciation =
+ marketPrice < h.purchaseRate ? Math.round((h.faceValue * (h.purchaseRate - marketPrice)) / 100) : 0;
+ return { holding: h, marketPrice: +marketPrice.toFixed(2), depreciation };
+ })
+ .filter((r) => r.depreciation > 0);
+ }
+
+ get depreciationTotal(): number {
+ return this.depreciationTargets.reduce((s, r) => s + r.depreciation, 0);
+ }
+
+ runDepreciation(): void {
+ const targets = this.depreciationTargets;
+ if (targets.length === 0) {
+ this.toast('No holdings require depreciation provisioning.');
+ return;
+ }
+ const newTxns: InvestmentTxn[] = targets.map((t, i) => ({
+ certNo: t.holding.certNo,
+ instrumentType: t.holding.instrumentType,
+ txnType: 'AMORTIZE',
+ voucherNo: `INV/DEPR/${this.depreciationDate.replace(/-/g, '')}-${i + 1}`,
+ txnDate: this.depreciationDate,
+ amount: t.depreciation,
+ particulars: `Investment depreciation provision - ${t.holding.scriptName} (market ${t.marketPrice})`
+ }));
+ this.txns = [
+ ...newTxns,
+ ...this.txns
+ ];
+ this.toast(
+ `Depreciation provisioned for ${targets.length} holding(s). Total ₹${this.depreciationTotal.toLocaleString('en-IN')}.`
+ );
+ }
+
+ // -------------------- Mutual Fund Transfer --------------------
+ get mfHoldings(): InvestmentHolding[] {
+ return this.holdings.filter((h) => h.instrumentType === 'MUTUAL_FUND' && h.status === 'ACTIVE');
+ }
+
+ get mfFromHolding(): InvestmentHolding | undefined {
+ return this.holdings.find((h) => h.certNo === this.mfFromCertNo);
+ }
+
+ get mfTransferValue(): number {
+ const h = this.mfFromHolding;
+ if (!h || !this.mfTransferUnits) {
+ return 0;
+ }
+ return Math.round(this.mfTransferUnits * h.purchaseRate);
+ }
+
+ saveMfTransfer(): void {
+ const h = this.mfFromHolding;
+ if (!h || !this.mfToProduct || !this.mfTransferUnits) {
+ this.toast('Select source holding, target product and units to transfer.');
+ return;
+ }
+ if (this.mfTransferUnits > h.units) {
+ this.toast(`Units cannot exceed units held (${h.units}).`);
+ return;
+ }
+ const value = this.mfTransferValue;
+ h.units = +(h.units - this.mfTransferUnits).toFixed(3);
+ h.faceValue = Math.round(h.units * h.purchaseRate);
+ if (h.units <= 0) {
+ h.status = 'SOLD';
+ }
+ const product = this.mfProductOptions.find((p) => p.productName === this.mfToProduct);
+ const newCert = `MF-${5000 + this.holdings.filter((x) => x.instrumentType === 'MUTUAL_FUND').length + 1}`;
+ this.holdings = [
+ {
+ certNo: newCert,
+ instrumentType: 'MUTUAL_FUND',
+ scriptCode: product?.productCode || this.mfToProduct,
+ scriptName: this.mfToProduct,
+ party: product?.amcName || '',
+ subType: product?.category || 'DEBT',
+ faceValue: value,
+ purchaseRate: h.purchaseRate,
+ units: this.mfTransferUnits,
+ purchaseDate: this.mfTransferDate,
+ maturityDate: addPeriod(this.mfTransferDate, 1, 0),
+ interestRate: h.interestRate,
+ interestFreq: 'CUMULATIVE',
+ glCode: '310050',
+ glName: 'INVESTMENT IN MUTUAL FUNDS',
+ crToAc: h.crToAc,
+ brokerCode: '',
+ status: 'ACTIVE'
+ },
+ ...this.holdings
+ ];
+ this.txns = [
+ {
+ certNo: newCert,
+ instrumentType: 'MUTUAL_FUND',
+ txnType: 'PURCHASE',
+ voucherNo: `INV/MF-TRF/${newCert}`,
+ txnDate: this.mfTransferDate,
+ amount: value,
+ particulars: `Mutual Fund switch from ${h.scriptName} to ${this.mfToProduct} (${this.mfTransferUnits} units)`
+ },
+ ...this.txns
+ ];
+ this.toast(`Transferred ${this.mfTransferUnits} units to ${this.mfToProduct} as ${newCert}.`);
+ this.mfFromCertNo = '';
+ this.mfToProduct = '';
+ this.mfTransferUnits = null;
+ }
+
+ // -------------------- Helpers --------------------
+ accrued(h: InvestmentHolding): number {
+ return accruedInterest(h, this.asOnDate);
+ }
+
+ maturity(h: InvestmentHolding): number {
+ return maturityAmount(h);
+ }
+
+ daysLeft(h: InvestmentHolding): number {
+ return daysToMaturity(h, this.asOnDate);
+ }
+
+ statusClass(h: InvestmentHolding): string {
+ return `inv-badge inv-badge--${h.status.toLowerCase()}`;
+ }
+
+ private toast(msg: string): void {
+ this.toastMsg = msg;
+ this.toastVisible = true;
+ if (this.toastTimer) {
+ clearTimeout(this.toastTimer);
+ }
+ this.toastTimer = setTimeout(() => (this.toastVisible = false), 3200);
+ }
+}
diff --git a/src/app/investment/fd-investment/fd-investment.component.html b/src/app/investment/fd-investment/fd-investment.component.html
new file mode 100644
index 000000000..bac98204f
--- /dev/null
+++ b/src/app/investment/fd-investment/fd-investment.component.html
@@ -0,0 +1,472 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @if (activeTab === 'holdings') {
+
+
FD Holdings Register
+
+
+
+ | Cert No |
+ Party |
+ Type |
+ Face Value |
+ Rate |
+ Purchase Date |
+ Maturity Date |
+ Accrued Interest |
+ Maturity Value |
+ Status |
+
+
+
+ @for (h of holdings; track h.certNo) {
+
+ |
+ {{ h.certNo }}
+ |
+ {{ h.party }} |
+ {{ h.interestFreq === 'CUMULATIVE' ? 'Cumulative' : 'Payout' }} |
+ ₹{{ h.faceValue | number: '1.2-2' }} |
+ {{ h.interestRate }}% |
+ {{ h.purchaseDate }} |
+ {{ h.maturityDate }} |
+ ₹{{ accrued(h) | number: '1.2-2' }} |
+ ₹{{ maturity(h) | number: '1.2-2' }} |
+
+ {{ h.status }}
+ |
+
+ }
+
+
+
+ }
+
+
+ @if (activeTab === 'purchase') {
+
+ }
+
+
+ @if (activeTab === 'interest') {
+
+ }
+
+
+ @if (activeTab === 'sell') {
+
+ }
+
+
+ @if (activeTab === 'writeoff') {
+
+
Investment - FD Write Off Entry
+
+
+ @if (writeoffHolding; as h) {
+
+ }
+
+
+
+
+
+
+ }
+
+
+ @if (activeTab === 'partpayment') {
+
+
Investment - FD Part Payment Entry
+
+
+ @if (partPayHolding; as h) {
+
+ }
+
+
+
+
+
+
+ }
+
+ @if (activeTab !== 'holdings') {
+
+
FD Transaction Log
+
+
+
+ | Date |
+ Voucher No |
+ Cert No |
+ Type |
+ Particulars |
+ Amount |
+
+
+
+ @for (t of txns; track t.voucherNo) {
+
+ | {{ t.txnDate }} |
+
+ {{ t.voucherNo }}
+ |
+ {{ t.certNo }} |
+ {{ t.txnType }} |
+ {{ t.particulars }} |
+ ₹{{ t.amount | number: '1.2-2' }} |
+
+ }
+
+
+
+ }
+
{{ toastMsg }}
diff --git a/src/app/investment/fd-investment/fd-investment.component.ts b/src/app/investment/fd-investment/fd-investment.component.ts
new file mode 100644
index 000000000..739adf032
--- /dev/null
+++ b/src/app/investment/fd-investment/fd-investment.component.ts
@@ -0,0 +1,461 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import {
+ FD_HOLDINGS,
+ ALL_TXNS,
+ PARTY_MASTER,
+ SUBTYPE_MASTER,
+ FD_TYPE_OPTIONS,
+ INT_TYPE_OPTIONS,
+ LIEN_REASON_MASTER,
+ InvestmentHolding,
+ InvestmentTxn,
+ InterestFreq,
+ accruedInterest,
+ daysToMaturity,
+ maturityAmount,
+ addPeriod,
+ todayDDMMYYYY
+} from '../investment-data';
+
+type FdTab = 'holdings' | 'purchase' | 'interest' | 'sell' | 'writeoff' | 'partpayment';
+
+interface FdPurchaseForm {
+ tranType: 'FRESH' | 'RENEWAL';
+ oldCertNo: string;
+ fdType: string;
+ /** GENERAL uses the period (Y/M/D) fields; DATEWISE lets the user type the maturity date directly. */
+ matureAmtCalcType: 'GENERAL' | 'DATEWISE';
+ certNo: string;
+ certDate: string;
+ party: string;
+ subParty: string;
+ glAcNo: string;
+ glAcName: string;
+ subType: string;
+ receiptAdvice: 'RECEIPT' | 'ADVICE';
+ transactionDate: string;
+ depositDate: string;
+ depositAmount: number | null;
+ interestFreq: InterestFreq;
+ interestDate: string;
+ interestRate: number | null;
+ periodYear: number | null;
+ periodMonth: number | null;
+ periodDays: number | null;
+ /** Only used when matureAmtCalcType === 'DATEWISE'. */
+ manualMaturityDate: string;
+ resolutionNo: string;
+ crBranchCode: string;
+ crToAc: string;
+ crToAcName: string;
+ intReceivableCode: string;
+ lien: 'YES' | 'NO';
+ lienAmt: number | null;
+ lienReason: string;
+ classification: string;
+ collable: 'YES' | 'NO';
+}
+
+/**
+ * FD (Fixed Deposit) treasury investment screen — Holdings register + Purchase / Interest /
+ * Sell-Premature / Write-off / Part-Payment entry tabs, modelled on the legacy "Investment - FD
+ * Purchase Entry" form. Dummy in-memory data only; Save appends to the local holdings/txns
+ * arrays so the demo feels interactive without any backend.
+ */
+@Component({
+ selector: 'mifosx-fd-investment',
+ templateUrl: './fd-investment.component.html',
+ styleUrls: [
+ '../../cashier/cashier-shared.scss',
+ '../investment-shared.scss'
+ ],
+ standalone: true,
+ imports: [
+ CommonModule,
+ FormsModule
+ ]
+})
+export class FdInvestmentComponent {
+ activeTab: FdTab = 'holdings';
+ asOnDate = todayDDMMYYYY();
+
+ holdings: InvestmentHolding[] = [...FD_HOLDINGS];
+ txns: InvestmentTxn[] = ALL_TXNS.filter((t) => t.instrumentType === 'FD');
+
+ readonly partyOptions = PARTY_MASTER;
+ readonly subTypeOptions = SUBTYPE_MASTER;
+ readonly fdTypeOptions = FD_TYPE_OPTIONS;
+ readonly intTypeOptions = INT_TYPE_OPTIONS;
+ readonly lienReasonOptions = LIEN_REASON_MASTER;
+ readonly branchOptions = [
+ 'HEAD OFFICE',
+ 'BRANCH 1',
+ 'BRANCH 2'
+ ];
+
+ toastMsg = '';
+ toastVisible = false;
+ private toastTimer: ReturnType | undefined;
+
+ purchaseForm: FdPurchaseForm = this.blankPurchaseForm();
+ /** Certificate No typed into the Purchase Entry's Search box (legacy "Search" button). */
+ searchCertNo = '';
+
+ interestCertNo = '';
+ sellCertNo = '';
+ sellDate = this.asOnDate;
+ sellRemark = '';
+ writeoffCertNo = '';
+ writeoffReason = '';
+ partPayCertNo = '';
+ partPayAmount: number | null = null;
+
+ setTab(tab: FdTab): void {
+ this.activeTab = tab;
+ }
+
+ get activeHoldings(): InvestmentHolding[] {
+ return this.holdings.filter((h) => h.status === 'ACTIVE');
+ }
+
+ private nextCertNo(): string {
+ const nums = this.holdings.map((h) => parseInt(h.certNo, 10)).filter((n) => !isNaN(n));
+ return String((nums.length ? Math.max(...nums) : 15619) + 1);
+ }
+
+ private blankPurchaseForm(): FdPurchaseForm {
+ return {
+ tranType: 'FRESH',
+ oldCertNo: '',
+ fdType: 'CUMMULATIVE',
+ matureAmtCalcType: 'GENERAL',
+ certNo: this.nextCertNo(),
+ certDate: this.asOnDate,
+ party: '',
+ subParty: '',
+ glAcNo: '320020',
+ glAcName: 'FIXED DEPO. CO-OPER. BANK MAIN',
+ subType: 'NON SLR',
+ receiptAdvice: 'RECEIPT',
+ transactionDate: this.asOnDate,
+ depositDate: this.asOnDate,
+ depositAmount: null,
+ interestFreq: 'CUMULATIVE',
+ interestDate: this.asOnDate,
+ interestRate: null,
+ periodYear: 2,
+ periodMonth: 0,
+ periodDays: 0,
+ manualMaturityDate: '',
+ resolutionNo: '',
+ crBranchCode: 'HEAD OFFICE',
+ crToAc: '310070',
+ crToAcName: 'CURRENT A/C CO-OP. BANK MAIN BR.41',
+ intReceivableCode: '320020',
+ lien: 'NO',
+ lienAmt: null,
+ lienReason: '',
+ classification: '',
+ collable: 'NO'
+ };
+ }
+
+ get purchaseMaturityDate(): string {
+ const f = this.purchaseForm;
+ if (f.matureAmtCalcType === 'DATEWISE') {
+ return f.manualMaturityDate;
+ }
+ if (!f.depositDate) {
+ return '';
+ }
+ const base = addPeriod(f.depositDate, f.periodYear || 0, f.periodMonth || 0);
+ return f.periodDays ? addPeriod(base, 0, 0, f.periodDays) : base;
+ }
+
+ get purchaseMaturityAmount(): number {
+ const f = this.purchaseForm;
+ if (!f.depositAmount || !f.interestRate || !this.purchaseMaturityDate) {
+ return 0;
+ }
+ return maturityAmount({
+ certNo: f.certNo,
+ instrumentType: 'FD',
+ scriptCode: '',
+ scriptName: '',
+ party: f.party,
+ subType: f.subType,
+ faceValue: f.depositAmount,
+ purchaseRate: 100,
+ units: 1,
+ purchaseDate: f.depositDate,
+ maturityDate: this.purchaseMaturityDate,
+ interestRate: f.interestRate,
+ interestFreq: f.interestFreq,
+ glCode: f.glAcNo,
+ glName: '',
+ crToAc: f.crToAc,
+ brokerCode: '',
+ status: 'ACTIVE'
+ });
+ }
+
+ savePurchase(): void {
+ const f = this.purchaseForm;
+ if (!f.party || !f.depositAmount || !f.interestRate || !this.purchaseMaturityDate) {
+ this.toast('Please fill Party, Deposit Amount, Interest Rate and Period.');
+ return;
+ }
+ const holding: InvestmentHolding = {
+ certNo: f.certNo,
+ instrumentType: 'FD',
+ scriptCode: f.interestFreq === 'CUMULATIVE' ? 'FD-CUM' : 'FD-MIP',
+ scriptName: f.fdType ? `${f.fdType} Fixed Deposit` : 'Fixed Deposit',
+ party: f.party,
+ subType: f.subType,
+ faceValue: f.depositAmount,
+ purchaseRate: 100,
+ units: 1,
+ purchaseDate: f.depositDate,
+ maturityDate: this.purchaseMaturityDate,
+ interestRate: f.interestRate,
+ interestFreq: f.interestFreq,
+ glCode: f.glAcNo,
+ glName: f.glAcName,
+ crToAc: f.crToAc,
+ brokerCode: '',
+ status: 'ACTIVE'
+ };
+ this.holdings = [
+ holding,
+ ...this.holdings
+ ];
+ this.txns = [
+ {
+ certNo: holding.certNo,
+ instrumentType: 'FD',
+ txnType: 'PURCHASE',
+ voucherNo: `INV/PUR/FD-${holding.certNo}`,
+ txnDate: f.transactionDate,
+ amount: holding.faceValue,
+ particulars: `${f.tranType === 'RENEWAL' ? 'Renewal' : 'Fresh'} FD Purchase - ${holding.party}`
+ },
+ ...this.txns
+ ];
+ this.toast(`FD Certificate No. ${holding.certNo} saved successfully.`);
+ this.purchaseForm = this.blankPurchaseForm();
+ this.activeTab = 'holdings';
+ }
+
+ cancelPurchase(): void {
+ this.purchaseForm = this.blankPurchaseForm();
+ this.toast('Entry cancelled — form reset.');
+ }
+
+ /** Legacy "Search" button — loads an existing certificate's values back into the form. */
+ searchPurchase(): void {
+ const h = this.holdings.find((x) => x.certNo === this.searchCertNo.trim());
+ if (!h) {
+ this.toast(`Certificate No. ${this.searchCertNo} not found.`);
+ return;
+ }
+ this.purchaseForm = {
+ ...this.blankPurchaseForm(),
+ tranType: 'FRESH',
+ certNo: h.certNo,
+ certDate: h.purchaseDate,
+ party: h.party,
+ subType: h.subType,
+ glAcNo: h.glCode,
+ glAcName: h.glName,
+ transactionDate: h.purchaseDate,
+ depositDate: h.purchaseDate,
+ depositAmount: h.faceValue,
+ interestFreq: h.interestFreq,
+ interestDate: h.purchaseDate,
+ interestRate: h.interestRate,
+ matureAmtCalcType: 'DATEWISE',
+ manualMaturityDate: h.maturityDate,
+ crToAc: h.crToAc
+ };
+ this.toast(`Certificate ${h.certNo} loaded.`);
+ }
+
+ /** Legacy "Drop" button — removes the loaded certificate from the register. */
+ dropPurchase(): void {
+ const certNo = this.purchaseForm.certNo;
+ const exists = this.holdings.some((h) => h.certNo === certNo);
+ if (!exists) {
+ this.toast('Nothing to drop — this certificate is not yet saved.');
+ return;
+ }
+ this.holdings = this.holdings.filter((h) => h.certNo !== certNo);
+ this.txns = this.txns.filter((t) => t.certNo !== certNo);
+ this.purchaseForm = this.blankPurchaseForm();
+ this.toast(`Certificate ${certNo} dropped.`);
+ }
+
+ /** Legacy "Exit" button — closes the entry form and returns to the register. */
+ exitPurchase(): void {
+ this.purchaseForm = this.blankPurchaseForm();
+ this.activeTab = 'holdings';
+ }
+
+ // -------------------- Interest --------------------
+ get interestHolding(): InvestmentHolding | undefined {
+ return this.holdings.find((h) => h.certNo === this.interestCertNo);
+ }
+
+ interestAccrued(h: InvestmentHolding): number {
+ return accruedInterest(h, this.asOnDate);
+ }
+
+ postInterest(): void {
+ const h = this.interestHolding;
+ if (!h) {
+ this.toast('Select a certificate first.');
+ return;
+ }
+ const amt = this.interestAccrued(h);
+ this.txns = [
+ {
+ certNo: h.certNo,
+ instrumentType: 'FD',
+ txnType: 'INTEREST',
+ voucherNo: `INV/INT/FD-${h.certNo}-${this.txns.length + 1}`,
+ txnDate: this.asOnDate,
+ amount: amt,
+ particulars: `Interest posted - ${h.party} (${h.interestFreq})`
+ },
+ ...this.txns
+ ];
+ this.toast(`Interest of ₹${amt.toLocaleString('en-IN')} posted for Certificate ${h.certNo}.`);
+ this.interestCertNo = '';
+ }
+
+ // -------------------- Sell / Premature --------------------
+ get sellHolding(): InvestmentHolding | undefined {
+ return this.holdings.find((h) => h.certNo === this.sellCertNo);
+ }
+
+ saveSell(): void {
+ const h = this.sellHolding;
+ if (!h || !this.sellDate) {
+ this.toast('Select a certificate and sell/premature date.');
+ return;
+ }
+ const payout = h.faceValue + accruedInterest(h, this.sellDate);
+ h.status = 'SOLD';
+ this.txns = [
+ {
+ certNo: h.certNo,
+ instrumentType: 'FD',
+ txnType: 'SELL',
+ voucherNo: `INV/SEL/FD-${h.certNo}`,
+ txnDate: this.sellDate,
+ amount: payout,
+ particulars: `Premature closure - ${h.party}${this.sellRemark ? ' - ' + this.sellRemark : ''}`
+ },
+ ...this.txns
+ ];
+ this.toast(`Certificate ${h.certNo} closed. Payout ₹${payout.toLocaleString('en-IN')}.`);
+ this.sellCertNo = '';
+ this.sellRemark = '';
+ this.activeTab = 'holdings';
+ }
+
+ // -------------------- Write-off --------------------
+ get writeoffHolding(): InvestmentHolding | undefined {
+ return this.holdings.find((h) => h.certNo === this.writeoffCertNo);
+ }
+
+ saveWriteoff(): void {
+ const h = this.writeoffHolding;
+ if (!h || !this.writeoffReason) {
+ this.toast('Select a certificate and enter a write-off reason.');
+ return;
+ }
+ h.status = 'WRITTEN_OFF';
+ this.txns = [
+ {
+ certNo: h.certNo,
+ instrumentType: 'FD',
+ txnType: 'WRITE_OFF',
+ voucherNo: `INV/WOF/FD-${h.certNo}`,
+ txnDate: this.asOnDate,
+ amount: h.faceValue,
+ particulars: `Written off - ${this.writeoffReason}`
+ },
+ ...this.txns
+ ];
+ this.toast(`Certificate ${h.certNo} written off.`);
+ this.writeoffCertNo = '';
+ this.writeoffReason = '';
+ this.activeTab = 'holdings';
+ }
+
+ // -------------------- Part Payment --------------------
+ get partPayHolding(): InvestmentHolding | undefined {
+ return this.holdings.find((h) => h.certNo === this.partPayCertNo);
+ }
+
+ savePartPayment(): void {
+ const h = this.partPayHolding;
+ if (!h || !this.partPayAmount || this.partPayAmount <= 0 || this.partPayAmount >= h.faceValue) {
+ this.toast('Select a certificate and enter a valid part-payment amount (less than face value).');
+ return;
+ }
+ h.faceValue -= this.partPayAmount;
+ this.txns = [
+ {
+ certNo: h.certNo,
+ instrumentType: 'FD',
+ txnType: 'PART_PAYMENT',
+ voucherNo: `INV/PP/FD-${h.certNo}-${this.txns.length + 1}`,
+ txnDate: this.asOnDate,
+ amount: this.partPayAmount,
+ particulars: `Part payment withdrawn - ${h.party}, balance ₹${h.faceValue.toLocaleString('en-IN')}`
+ },
+ ...this.txns
+ ];
+ this.toast(`Part payment of ₹${this.partPayAmount.toLocaleString('en-IN')} recorded for Certificate ${h.certNo}.`);
+ this.partPayCertNo = '';
+ this.partPayAmount = null;
+ this.activeTab = 'holdings';
+ }
+
+ // -------------------- Helpers --------------------
+ accrued(h: InvestmentHolding): number {
+ return accruedInterest(h, this.asOnDate);
+ }
+
+ maturity(h: InvestmentHolding): number {
+ return maturityAmount(h);
+ }
+
+ daysLeft(h: InvestmentHolding): number {
+ return daysToMaturity(h, this.asOnDate);
+ }
+
+ statusClass(h: InvestmentHolding): string {
+ return `inv-badge inv-badge--${h.status.toLowerCase()}`;
+ }
+
+ private toast(msg: string): void {
+ this.toastMsg = msg;
+ this.toastVisible = true;
+ if (this.toastTimer) {
+ clearTimeout(this.toastTimer);
+ }
+ this.toastTimer = setTimeout(() => (this.toastVisible = false), 3200);
+ }
+}
diff --git a/src/app/investment/investment-dashboard/investment-dashboard.component.html b/src/app/investment/investment-dashboard/investment-dashboard.component.html
new file mode 100644
index 000000000..43309fba5
--- /dev/null
+++ b/src/app/investment/investment-dashboard/investment-dashboard.component.html
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+
+ Total Holdings
+ {{ totalHoldings }}
+ {{ activeCount }} active · {{ maturedCount }} matured
+
+
+ Total Invested (Face Value)
+ ₹{{ totalFaceValue | number: '1.2-2' }}
+
+
+ Accrued Interest / Income
+ ₹{{ totalAccruedInterest | number: '1.2-2' }}
+
+
+ Projected Value at Maturity
+ ₹{{ totalMaturityValue | number: '1.2-2' }}
+
+
+
+
+
Instrument-wise Break-up
+
+
+
+ | Instrument Type |
+ Holdings |
+ Face Value |
+ Accrued Interest |
+ Maturity Value |
+ |
+
+
+
+ @for (s of summaries; track s.type) {
+
+ | {{ s.label }} |
+ {{ s.count }} |
+ ₹{{ s.faceValue | number: '1.2-2' }} |
+ ₹{{ s.accruedInterest | number: '1.2-2' }} |
+ ₹{{ s.maturityValue | number: '1.2-2' }} |
+
+ Open
+ |
+
+ }
+
+
+
+ | Total |
+ {{ totalHoldings }} |
+ ₹{{ totalFaceValue | number: '1.2-2' }} |
+ ₹{{ totalAccruedInterest | number: '1.2-2' }} |
+ ₹{{ totalMaturityValue | number: '1.2-2' }} |
+ |
+
+
+
+
+
+
+
Due-Date Diary — Maturing Within 90 Days
+ @if (maturingSoon.length === 0) {
+
No holdings maturing in the next 90 days.
+ } @else {
+
+ @for (h of maturingSoon; track h.certNo) {
+
+
+ {{ h.certNo }}
+ {{ h.scriptName }} — {{ h.party }} ({{ instrumentLabel(h.instrumentType) }})
+
+
+ Matures {{ h.maturityDate }} ·
+
+ {{ daysLeft(h) }} days
+
+
+
+ }
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @if (activeTab === 'fdCalc') {
+
+ }
+
+
+ @if (activeTab === 'bondCalc') {
+
+ }
+
+
+ @if (activeTab === 'bondIntRegister') {
+
+
Government Bond Interest Register
+
+
+
+ | Date |
+ Voucher No |
+ Cert No |
+ Instrument |
+ Particulars |
+ Interest Amount |
+
+
+
+ @for (t of bondIntRegister; track t.voucherNo) {
+
+ | {{ t.txnDate }} |
+
+ {{ t.voucherNo }}
+ |
+ {{ t.certNo }} |
+ {{ instrumentLabel(t.instrumentType) }} |
+ {{ t.particulars }} |
+ ₹{{ t.amount | number: '1.2-2' }} |
+
+ } @empty {
+
+ | No bond interest entries recorded yet. |
+
+ }
+
+
+
+ | Total |
+ ₹{{ bondIntRegisterTotal | number: '1.2-2' }} |
+
+
+
+
+ }
+
+
+ @if (activeTab === 'fdIntRegister') {
+
+
FD Interest Register
+
+
+
+ | Date |
+ Voucher No |
+ Cert No |
+ Particulars |
+ Interest Amount |
+
+
+
+ @for (t of fdIntRegister; track t.voucherNo) {
+
+ | {{ t.txnDate }} |
+
+ {{ t.voucherNo }}
+ |
+ {{ t.certNo }} |
+ {{ t.particulars }} |
+ ₹{{ t.amount | number: '1.2-2' }} |
+
+ } @empty {
+
+ | No FD interest entries recorded yet. |
+
+ }
+
+
+
+ | Total |
+ ₹{{ fdIntRegisterTotal | number: '1.2-2' }} |
+
+
+
+
+ }
+
+
+ @if (activeTab === 'fdRegister') {
+
+
FD Register
+
+
+
+ | Cert No |
+ Party |
+ Sub Type |
+ Face Value |
+ Rate |
+ Frequency |
+ Deposit Date |
+ Maturity Date |
+ Days Left |
+ Accrued Interest |
+ Maturity Value |
+ Status |
+
+
+
+ @for (h of fdRegister; track h.certNo) {
+
+ |
+ {{ h.certNo }}
+ |
+ {{ h.party }} |
+ {{ h.subType }} |
+ ₹{{ h.faceValue | number: '1.2-2' }} |
+ {{ h.interestRate }}% |
+ {{ h.interestFreq }} |
+ {{ h.purchaseDate }} |
+ {{ h.maturityDate }} |
+ {{ daysLeft(h) }} |
+ ₹{{ accrued(h) | number: '1.2-2' }} |
+ ₹{{ maturity(h) | number: '1.2-2' }} |
+
+ {{ h.status }}
+ |
+
+ }
+
+
+
+ | Total |
+ ₹{{ fdRegisterFaceTotal | number: '1.2-2' }} |
+ |
+ ₹{{ fdRegisterAccruedTotal | number: '1.2-2' }} |
+ ₹{{ fdRegisterMaturityTotal | number: '1.2-2' }} |
+ |
+
+
+
+
+ }
+
{{ toastMsg }}
diff --git a/src/app/investment/investment-interest/investment-interest.component.ts b/src/app/investment/investment-interest/investment-interest.component.ts
new file mode 100644
index 000000000..8910706cb
--- /dev/null
+++ b/src/app/investment/investment-interest/investment-interest.component.ts
@@ -0,0 +1,247 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import {
+ FD_HOLDINGS,
+ GOVT_SECURITY_HOLDINGS,
+ NON_SLR_HOLDINGS,
+ BOND_HOLDINGS,
+ ALL_TXNS,
+ SCRIPT_MASTER,
+ InvestmentHolding,
+ InvestmentTxn,
+ InstrumentType,
+ INSTRUMENT_LABELS,
+ accruedInterest,
+ daysToMaturity,
+ maturityAmount,
+ todayDDMMYYYY
+} from '../investment-data';
+
+type InterestTab = 'fdCalc' | 'bondCalc' | 'bondIntRegister' | 'fdIntRegister' | 'fdRegister';
+
+/**
+ * The legacy "Interest" top-menu for Investment — 5 screens:
+ * 01 FD Interest Calculation, 02 Govt./Bond Int. Calculation (both batch "Process" runs),
+ * 03 Government Bond Int Register, 04 FD Interest Register, 05 FD Register (listings).
+ *
+ * Interest figures are derived from the same holdings used by the Entry screens and Reports,
+ * so a register here always agrees with what a Purchase/Interest entry recorded.
+ */
+@Component({
+ selector: 'mifosx-investment-interest',
+ templateUrl: './investment-interest.component.html',
+ styleUrls: [
+ '../../cashier/cashier-shared.scss',
+ '../investment-shared.scss'
+ ],
+ standalone: true,
+ imports: [
+ CommonModule,
+ FormsModule
+ ]
+})
+export class InvestmentInterestComponent {
+ activeTab: InterestTab = 'fdCalc';
+ asOnDate = todayDDMMYYYY();
+
+ fdHoldings: InvestmentHolding[] = [...FD_HOLDINGS];
+ bondHoldings: InvestmentHolding[] = [
+ ...GOVT_SECURITY_HOLDINGS,
+ ...NON_SLR_HOLDINGS,
+ ...BOND_HOLDINGS
+ ];
+ txns: InvestmentTxn[] = [...ALL_TXNS];
+
+ readonly scriptOptions = SCRIPT_MASTER;
+
+ toastMsg = '';
+ toastVisible = false;
+ private toastTimer: ReturnType | undefined;
+
+ // 01 FD Interest Calculation
+ fdCalcDate = this.asOnDate;
+ fdCalcCertNo = '';
+ fdCalcAll = false;
+
+ // 02 Govt./Bond Int. Calculation
+ bondCalcDate = this.asOnDate;
+ bondCalcType: InstrumentType | '' = '';
+ bondCalcScript = '';
+ bondCalcDealNo = '';
+ bondCalcAll = false;
+
+ // Register filters
+ registerFromDate = '';
+ registerToDate = '';
+
+ setTab(tab: InterestTab): void {
+ this.activeTab = tab;
+ }
+
+ instrumentLabel(type: InstrumentType): string {
+ return INSTRUMENT_LABELS[type];
+ }
+
+ statusClass(h: InvestmentHolding): string {
+ return `inv-badge inv-badge--${h.status.toLowerCase()}`;
+ }
+
+ maturity(h: InvestmentHolding): number {
+ return maturityAmount(h);
+ }
+
+ daysLeft(h: InvestmentHolding): number {
+ return daysToMaturity(h, this.asOnDate);
+ }
+
+ // -------------------- 01 FD Interest Calculation --------------------
+ get fdCalcTargets(): InvestmentHolding[] {
+ if (this.fdCalcAll) {
+ return this.fdHoldings.filter((h) => h.status === 'ACTIVE');
+ }
+ return this.fdHoldings.filter(
+ (h) => h.status === 'ACTIVE' && (!this.fdCalcCertNo || h.certNo === this.fdCalcCertNo)
+ );
+ }
+
+ fdInterest(h: InvestmentHolding): number {
+ return accruedInterest(h, this.fdCalcDate || this.asOnDate);
+ }
+
+ get fdCalcTotal(): number {
+ return this.fdCalcTargets.reduce((s, h) => s + this.fdInterest(h), 0);
+ }
+
+ processFdInterest(): void {
+ const targets = this.fdCalcTargets;
+ if (targets.length === 0) {
+ this.toast('No FD holdings match the selected filters.');
+ return;
+ }
+ const newTxns: InvestmentTxn[] = targets.map((h, i) => ({
+ certNo: h.certNo,
+ instrumentType: 'FD',
+ txnType: 'INTEREST',
+ voucherNo: `INV/FD-INT/${(this.fdCalcDate || this.asOnDate).replace(/-/g, '')}-${i + 1}`,
+ txnDate: this.fdCalcDate || this.asOnDate,
+ amount: this.fdInterest(h),
+ particulars: `FD interest calculated - ${h.party}`
+ }));
+ this.txns = [
+ ...newTxns,
+ ...this.txns
+ ];
+ this.toast(
+ `FD interest processed for ${targets.length} certificate(s). Total ₹${this.fdCalcTotal.toLocaleString('en-IN')}.`
+ );
+ }
+
+ // -------------------- 02 Govt./Bond Int. Calculation --------------------
+ get bondCalcTargets(): InvestmentHolding[] {
+ if (this.bondCalcAll) {
+ return this.bondHoldings.filter((h) => h.status === 'ACTIVE');
+ }
+ return this.bondHoldings.filter((h) => {
+ if (h.status !== 'ACTIVE') return false;
+ if (this.bondCalcType && h.instrumentType !== this.bondCalcType) return false;
+ if (this.bondCalcScript && h.scriptCode !== this.bondCalcScript) return false;
+ if (this.bondCalcDealNo && h.certNo !== this.bondCalcDealNo.trim()) return false;
+ return true;
+ });
+ }
+
+ bondInterest(h: InvestmentHolding): number {
+ return accruedInterest(h, this.bondCalcDate || this.asOnDate);
+ }
+
+ get bondCalcTotal(): number {
+ return this.bondCalcTargets.reduce((s, h) => s + this.bondInterest(h), 0);
+ }
+
+ processBondInterest(): void {
+ const targets = this.bondCalcTargets;
+ if (targets.length === 0) {
+ this.toast('No Govt/Bond holdings match the selected filters.');
+ return;
+ }
+ const newTxns: InvestmentTxn[] = targets.map((h, i) => ({
+ certNo: h.certNo,
+ instrumentType: h.instrumentType,
+ txnType: 'INTEREST',
+ voucherNo: `INV/BOND-INT/${(this.bondCalcDate || this.asOnDate).replace(/-/g, '')}-${i + 1}`,
+ txnDate: this.bondCalcDate || this.asOnDate,
+ amount: this.bondInterest(h),
+ particulars: `Coupon/interest calculated - ${h.scriptName}`
+ }));
+ this.txns = [
+ ...newTxns,
+ ...this.txns
+ ];
+ this.toast(
+ `Interest processed for ${targets.length} holding(s). Total ₹${this.bondCalcTotal.toLocaleString('en-IN')}.`
+ );
+ }
+
+ // -------------------- 03 Government Bond Int Register --------------------
+ get bondIntRegister(): InvestmentTxn[] {
+ return this.txns.filter(
+ (t) => t.txnType === 'INTEREST' && ([
+ 'GOVT_SECURITY',
+ 'NON_SLR',
+ 'BOND'
+ ] as InstrumentType[]).includes(t.instrumentType)
+ );
+ }
+
+ get bondIntRegisterTotal(): number {
+ return this.bondIntRegister.reduce((s, t) => s + t.amount, 0);
+ }
+
+ // -------------------- 04 FD Interest Register --------------------
+ get fdIntRegister(): InvestmentTxn[] {
+ return this.txns.filter((t) => t.txnType === 'INTEREST' && t.instrumentType === 'FD');
+ }
+
+ get fdIntRegisterTotal(): number {
+ return this.fdIntRegister.reduce((s, t) => s + t.amount, 0);
+ }
+
+ // -------------------- 05 FD Register --------------------
+ get fdRegister(): InvestmentHolding[] {
+ return this.fdHoldings;
+ }
+
+ get fdRegisterFaceTotal(): number {
+ return this.fdRegister.reduce((s, h) => s + h.faceValue, 0);
+ }
+
+ get fdRegisterMaturityTotal(): number {
+ return this.fdRegister.reduce((s, h) => s + this.maturity(h), 0);
+ }
+
+ accrued(h: InvestmentHolding): number {
+ return accruedInterest(h, this.asOnDate);
+ }
+
+ get fdRegisterAccruedTotal(): number {
+ return this.fdRegister.reduce((s, h) => s + this.accrued(h), 0);
+ }
+
+ private toast(msg: string): void {
+ this.toastMsg = msg;
+ this.toastVisible = true;
+ if (this.toastTimer) {
+ clearTimeout(this.toastTimer);
+ }
+ this.toastTimer = setTimeout(() => (this.toastVisible = false), 3200);
+ }
+}
diff --git a/src/app/investment/investment-masters/investment-masters.component.html b/src/app/investment/investment-masters/investment-masters.component.html
new file mode 100644
index 000000000..d44cbf788
--- /dev/null
+++ b/src/app/investment/investment-masters/investment-masters.component.html
@@ -0,0 +1,557 @@
+
+
+
+
+
+
TREASURY · INVESTMENT · MASTERS
+
Investment Masters
+
+ Bank/Party, Script, SubType, Broker, Control Parameter, LIEN Reason, Mutual Fund Product, SGL Bank and Script
+ Market Detail masters.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @if (activeTab === 'party') {
+
+
Add Bank / Party
+
+
+
+
+
+
+
+
+
+
+
+ | Party Code |
+ Party Name |
+ Type |
+ PAN No |
+
+
+
+ @for (p of parties; track p.partyCode) {
+
+ |
+ {{ p.partyCode }}
+ |
+ {{ p.partyName }} |
+ {{ p.partyType }} |
+ {{ p.panNo }} |
+
+ }
+
+
+
+ }
+
+
+ @if (activeTab === 'script') {
+
+ }
+
+
+ @if (activeTab === 'subtype') {
+
+
Add Sub Type
+
+
+
+
+
+
+
+
+
+
+ | Code |
+ Sub Type |
+ Instrument |
+
+
+
+ @for (s of subTypes; track s.subTypeCode + s.subTypeName) {
+
+ |
+ {{ s.subTypeCode }}
+ |
+ {{ s.subTypeName }} |
+ {{ s.instrumentType }} |
+
+ }
+
+
+
+ }
+
+
+ @if (activeTab === 'broker') {
+
+ }
+
+
+ @if (activeTab === 'control') {
+
+ }
+
+
+ @if (activeTab === 'dailyscript') {
+
+ }
+
+
+ @if (activeTab === 'lien') {
+
+
Add LIEN Reason
+
+
+
+
+
+
+
+
+
+ | Reason Code |
+ Description |
+
+
+
+ @for (l of lienReasons; track l.reasonCode) {
+
+ |
+ {{ l.reasonCode }}
+ |
+ {{ l.reasonDescription }} |
+
+ }
+
+
+
+ }
+
+
+ @if (activeTab === 'mfproduct') {
+
+ }
+
+
+ @if (activeTab === 'sglbank') {
+
+
Add SGL Bank
+
+
+
+
+
+
+
+
+
+
+ | SGL Code |
+ Bank Name |
+ Branch |
+
+
+
+ @for (s of sglBanks; track s.sglCode) {
+
+ |
+ {{ s.sglCode }}
+ |
+ {{ s.bankName }} |
+ {{ s.branch }} |
+
+ }
+
+
+
+ }
+
+
+ @if (activeTab === 'marketdetail') {
+
+
Script Market Detail (Daily Script Rates)
+
+
+
+ | Script Code |
+ Market Price |
+ As On |
+ YTM (%) |
+
+
+
+ @for (m of marketDetails; track m.scriptCode) {
+
+ |
+ {{ m.scriptCode }}
+ |
+ ₹{{ m.marketPrice | number: '1.2-2' }} |
+ {{ m.asOnDate }} |
+ {{ m.ytm }}% |
+
+ }
+
+
+
+ }
+
{{ toastMsg }}
diff --git a/src/app/investment/investment-masters/investment-masters.component.ts b/src/app/investment/investment-masters/investment-masters.component.ts
new file mode 100644
index 000000000..de324cc4d
--- /dev/null
+++ b/src/app/investment/investment-masters/investment-masters.component.ts
@@ -0,0 +1,262 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import {
+ SCRIPT_MASTER,
+ BROKER_MASTER,
+ PARTY_MASTER,
+ SUBTYPE_MASTER,
+ CONTROL_PARAMETERS,
+ MUTUAL_FUND_PRODUCTS,
+ SGL_BANK_MASTER,
+ SCRIPT_MARKET_DETAIL,
+ DAILY_SCRIPT_RATES,
+ LIEN_REASON_MASTER,
+ ScriptMaster,
+ BrokerMaster,
+ PartyMaster,
+ SubTypeMaster,
+ ControlParameter,
+ MutualFundProductMaster,
+ SglBankMaster,
+ ScriptMarketDetail,
+ DailyScriptRate,
+ LienReason,
+ InstrumentType
+} from '../investment-data';
+
+type MasterTab =
+ | 'party'
+ | 'script'
+ | 'subtype'
+ | 'broker'
+ | 'control'
+ | 'dailyscript'
+ | 'lien'
+ | 'mfproduct'
+ | 'sglbank'
+ | 'marketdetail';
+
+/**
+ * Investment master-data screens (legacy "04-13" Entry submenu masters) — 9 simple dummy
+ * lists, each with an inline Add-row form so the demo stays interactive without a backend.
+ */
+@Component({
+ selector: 'mifosx-investment-masters',
+ templateUrl: './investment-masters.component.html',
+ styleUrls: [
+ '../../cashier/cashier-shared.scss',
+ '../investment-shared.scss'
+ ],
+ standalone: true,
+ imports: [
+ CommonModule,
+ FormsModule
+ ]
+})
+export class InvestmentMastersComponent {
+ activeTab: MasterTab = 'party';
+
+ scripts: ScriptMaster[] = [...SCRIPT_MASTER];
+ brokers: BrokerMaster[] = [...BROKER_MASTER];
+ parties: PartyMaster[] = [...PARTY_MASTER];
+ subTypes: SubTypeMaster[] = [...SUBTYPE_MASTER];
+ controlParams: ControlParameter[] = [...CONTROL_PARAMETERS];
+ mfProducts: MutualFundProductMaster[] = [...MUTUAL_FUND_PRODUCTS];
+ sglBanks: SglBankMaster[] = [...SGL_BANK_MASTER];
+ marketDetails: ScriptMarketDetail[] = [...SCRIPT_MARKET_DETAIL];
+ dailyScriptRates: DailyScriptRate[] = [...DAILY_SCRIPT_RATES];
+ lienReasons: LienReason[] = [...LIEN_REASON_MASTER];
+
+ readonly instrumentTypes: InstrumentType[] = [
+ 'FD',
+ 'GOVT_SECURITY',
+ 'NON_SLR',
+ 'BOND',
+ 'MUTUAL_FUND',
+ 'SHARE'
+ ];
+
+ toastMsg = '';
+ toastVisible = false;
+ private toastTimer: ReturnType | undefined;
+
+ newParty: Partial = {};
+ newScript: Partial = {};
+ newSubType: Partial = {};
+ newBroker: Partial = {};
+ newControlParam: Partial = {};
+ newLienReason: Partial = {};
+ newMfProduct: Partial = {};
+ newSglBank: Partial = {};
+ newDailyRate: Partial = {};
+
+ setTab(tab: MasterTab): void {
+ this.activeTab = tab;
+ }
+
+ addParty(): void {
+ if (!this.newParty.partyName || !this.newParty.partyType) {
+ this.toast('Enter Party Name and Type.');
+ return;
+ }
+ this.parties = [
+ {
+ partyCode: `PTY-${String(this.parties.length + 1).padStart(3, '0')}`,
+ panNo: '',
+ ...this.newParty
+ } as PartyMaster,
+ ...this.parties
+ ];
+ this.newParty = {};
+ this.toast('Party/Bank master added.');
+ }
+
+ addScript(): void {
+ if (!this.newScript.scriptName || !this.newScript.instrumentType) {
+ this.toast('Enter Script Name and Instrument Type.');
+ return;
+ }
+ this.scripts = [
+ {
+ scriptCode: this.newScript.scriptCode || `SCR-${this.scripts.length + 1}`,
+ isin: '',
+ faceValuePerUnit: 100,
+ ...this.newScript
+ } as ScriptMaster,
+ ...this.scripts
+ ];
+ this.newScript = {};
+ this.toast('Script master added.');
+ }
+
+ addSubType(): void {
+ if (!this.newSubType.subTypeName || !this.newSubType.instrumentType) {
+ this.toast('Enter Sub Type Name and Instrument Type.');
+ return;
+ }
+ this.subTypes = [
+ { subTypeCode: String(this.subTypes.length + 1), ...this.newSubType } as SubTypeMaster,
+ ...this.subTypes
+ ];
+ this.newSubType = {};
+ this.toast('Sub Type master added.');
+ }
+
+ addBroker(): void {
+ if (!this.newBroker.brokerName) {
+ this.toast('Enter Broker Name.');
+ return;
+ }
+ this.brokers = [
+ {
+ brokerCode: `BRK-${String(this.brokers.length + 1).padStart(3, '0')}`,
+ contactNo: '',
+ empanelledOn: '',
+ status: 'ACTIVE',
+ ...this.newBroker
+ } as BrokerMaster,
+ ...this.brokers
+ ];
+ this.newBroker = {};
+ this.toast('Broker master added.');
+ }
+
+ addControlParam(): void {
+ if (!this.newControlParam.paramName || !this.newControlParam.paramValue) {
+ this.toast('Enter Parameter Name and Value.');
+ return;
+ }
+ this.controlParams = [
+ { description: '', ...this.newControlParam } as ControlParameter,
+ ...this.controlParams
+ ];
+ this.newControlParam = {};
+ this.toast('Control parameter added.');
+ }
+
+ addLienReason(): void {
+ if (!this.newLienReason.reasonDescription) {
+ this.toast('Enter Reason Description.');
+ return;
+ }
+ this.lienReasons = [
+ { reasonCode: `LR-${String(this.lienReasons.length + 1).padStart(2, '0')}`, ...this.newLienReason } as LienReason,
+ ...this.lienReasons
+ ];
+ this.newLienReason = {};
+ this.toast('LIEN reason added.');
+ }
+
+ addMfProduct(): void {
+ if (!this.newMfProduct.productName || !this.newMfProduct.amcName) {
+ this.toast('Enter Product Name and AMC Name.');
+ return;
+ }
+ this.mfProducts = [
+ {
+ productCode: `MFP-${String(this.mfProducts.length + 1).padStart(2, '0')}`,
+ category: '',
+ riskLevel: 'MODERATE',
+ ...this.newMfProduct
+ } as MutualFundProductMaster,
+ ...this.mfProducts
+ ];
+ this.newMfProduct = {};
+ this.toast('Mutual Fund product added.');
+ }
+
+ addSglBank(): void {
+ if (!this.newSglBank.bankName) {
+ this.toast('Enter Bank Name.');
+ return;
+ }
+ this.sglBanks = [
+ {
+ sglCode: `SGL-${String(this.sglBanks.length + 1).padStart(2, '0')}`,
+ branch: '',
+ ...this.newSglBank
+ } as SglBankMaster,
+ ...this.sglBanks
+ ];
+ this.newSglBank = {};
+ this.toast('SGL Bank master added.');
+ }
+
+ addDailyRate(): void {
+ if (!this.newDailyRate.scriptCode || !this.newDailyRate.rateDate || this.newDailyRate.closeRate == null) {
+ this.toast('Enter Rate Date, Script Code and Close Rate.');
+ return;
+ }
+ const script = this.scripts.find((s) => s.scriptCode === this.newDailyRate.scriptCode);
+ this.dailyScriptRates = [
+ {
+ scriptName: script?.scriptName || '',
+ openRate: this.newDailyRate.closeRate,
+ highRate: this.newDailyRate.closeRate,
+ lowRate: this.newDailyRate.closeRate,
+ ...this.newDailyRate
+ } as DailyScriptRate,
+ ...this.dailyScriptRates
+ ];
+ this.newDailyRate = {};
+ this.toast('Daily script rate added.');
+ }
+
+ private toast(msg: string): void {
+ this.toastMsg = msg;
+ this.toastVisible = true;
+ if (this.toastTimer) {
+ clearTimeout(this.toastTimer);
+ }
+ this.toastTimer = setTimeout(() => (this.toastVisible = false), 3200);
+ }
+}
diff --git a/src/app/investment/investment-reports/investment-reports.component.html b/src/app/investment/investment-reports/investment-reports.component.html
new file mode 100644
index 000000000..cae27e4a5
--- /dev/null
+++ b/src/app/investment/investment-reports/investment-reports.component.html
@@ -0,0 +1,694 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @if (activeGroup === 'balance') {
+
+
+
+
+
+
+
+ @if (activeReport === 'govtSecBalance' || activeReport === 'shareBalance' || activeReport === 'fdrBalance') {
+
+
+ {{
+ activeReport === 'govtSecBalance'
+ ? 'Govt Security Balance Report'
+ : activeReport === 'shareBalance'
+ ? 'Share Balance Report'
+ : 'FDR Balance Report'
+ }}
+
+
+
+
+ | Cert No |
+ Script / Party |
+ Units |
+ Face Value |
+ Market/Purchase Rate |
+ Status |
+
+
+
+ @for (
+ h of activeReport === 'govtSecBalance'
+ ? govtSecHoldings
+ : activeReport === 'shareBalance'
+ ? shareHoldings
+ : fdHoldings;
+ track h.certNo
+ ) {
+
+ |
+ {{ h.certNo }}
+ |
+ {{ h.scriptName }} — {{ h.party }} |
+ {{ h.units | number }} |
+ ₹{{ h.faceValue | number: '1.2-2' }} |
+ {{ marketPrice(h.scriptCode) || h.purchaseRate }} |
+
+ {{ h.status }}
+ |
+
+ }
+
+
+
+ }
+ @if (activeReport === 'bankInvList') {
+
+
Bank Investment List
+
+
+
+ | Party / Bank |
+ No. of Holdings |
+ Total Face Value |
+
+
+
+ @for (r of bankInvestmentList; track r.party) {
+
+ | {{ r.party }} |
+ {{ r.count }} |
+ ₹{{ r.totalFaceValue | number: '1.2-2' }} |
+
+ }
+
+
+
+ }
+ }
+
+
+ @if (activeGroup === 'ledger') {
+
+
+
+
+
+
+
+
+
+
+
+ @if (
+ activeReport === 'fdLedger' ||
+ activeReport === 'bondLedger' ||
+ activeReport === 'shareLedger' ||
+ activeReport === 'amortizeLedger' ||
+ activeReport === 'dealSlip'
+ ) {
+
+
+ {{
+ activeReport === 'fdLedger'
+ ? 'FD Ledger'
+ : activeReport === 'bondLedger'
+ ? 'Govt/Bond Ledger'
+ : activeReport === 'shareLedger'
+ ? 'Share Ledger'
+ : activeReport === 'amortizeLedger'
+ ? 'Amortize Ledger'
+ : 'Deal Slip Register'
+ }}
+
+
+
+
+ | Date |
+ Voucher No |
+ Cert No |
+ Type |
+ Particulars |
+ Amount |
+
+
+
+ @for (
+ t of activeReport === 'fdLedger'
+ ? fdTxns
+ : activeReport === 'bondLedger'
+ ? bondTxns
+ : activeReport === 'shareLedger'
+ ? shareTxns
+ : activeReport === 'amortizeLedger'
+ ? amortizeTxns
+ : dealSlips;
+ track t.voucherNo
+ ) {
+
+ | {{ t.txnDate }} |
+
+ {{ t.voucherNo }}
+ |
+ {{ t.certNo }} |
+ {{ t.txnType }} |
+ {{ t.particulars }} |
+ ₹{{ t.amount | number: '1.2-2' }} |
+
+ } @empty {
+
+ | No entries. |
+
+ }
+
+
+
+ }
+ @if (activeReport === 'intDueRegister') {
+
+
Interest Due Register (Non-Cumulative Holdings)
+
+
+
+ | Cert No |
+ Script / Party |
+ Frequency |
+ Rate |
+ Due Amount (as on {{ asOnDate }}) |
+
+
+
+ @for (h of interestDueRegister; track h.certNo) {
+
+ |
+ {{ h.certNo }}
+ |
+ {{ h.scriptName }} — {{ h.party }} |
+ {{ h.interestFreq }} |
+ {{ h.interestRate }}% |
+ ₹{{ h.dueAmount | number: '1.2-2' }} |
+
+ }
+
+
+
+ }
+ @if (activeReport === 'slrRegister') {
+
+
SLR Bond Register
+
+
+
+ | Cert No |
+ Script |
+ Face Value |
+ Rate |
+ Maturity Date |
+
+
+
+ @for (h of slrBondRegister; track h.certNo) {
+
+ |
+ {{ h.certNo }}
+ |
+ {{ h.scriptName }} |
+ ₹{{ h.faceValue | number: '1.2-2' }} |
+ {{ h.interestRate }}% |
+ {{ h.maturityDate }} |
+
+ }
+
+
+
+ }
+ @if (activeReport === 'pendingReceived') {
+
+
Received Interest / Dividend
+
+
+
+ | Date |
+ Cert No |
+ Particulars |
+ Amount |
+
+
+
+ @for (t of receivedInterestTxns; track t.voucherNo) {
+
+ | {{ t.txnDate }} |
+ {{ t.certNo }} |
+ {{ t.particulars }} |
+ ₹{{ t.amount | number: '1.2-2' }} |
+
+ }
+
+
+
+
+
Pending Interest (No Interest Posted Yet)
+
+
+
+ | Cert No |
+ Script / Party |
+ Accrued (Pending) |
+
+
+
+ @for (h of pendingInterestHoldings; track h.certNo) {
+
+ |
+ {{ h.certNo }}
+ |
+ {{ h.scriptName }} — {{ h.party }} |
+ ₹{{ accrued(h) | number: '1.2-2' }} |
+
+ }
+
+
+
+ }
+ }
+
+
+ @if (activeGroup === 'maturity') {
+
+
+
+
+
+
+
+
+
+
+
+ @if (activeReport === 'maturedFd') {
+
+
List of Matured FD
+
+
+
+ | Cert No |
+ Party |
+ Face Value |
+ Matured On |
+
+
+
+ @for (h of maturedFdList; track h.certNo) {
+
+ |
+ {{ h.certNo }}
+ |
+ {{ h.party }} |
+ ₹{{ h.faceValue | number: '1.2-2' }} |
+ {{ h.maturityDate }} |
+
+ } @empty {
+
+ | No matured FDs. |
+
+ }
+
+
+
+ }
+ @if (activeReport === 'maturingList') {
+
+
Govt Security / FD Maturity List (sorted by days-to-maturity)
+
+
+
+ | Cert No |
+ Instrument |
+ Script / Party |
+ Maturity Date |
+ Days Left |
+ Maturity Value |
+
+
+
+ @for (h of maturingList; track h.certNo) {
+
+ |
+ {{ h.certNo }}
+ |
+ {{ instrumentLabel(h.instrumentType) }} |
+ {{ h.scriptName }} — {{ h.party }} |
+ {{ h.maturityDate }} |
+ {{ daysLeft(h) }} |
+ ₹{{ maturity(h) | number: '1.2-2' }} |
+
+ }
+
+
+
+ }
+ @if (activeReport === 'maturityPattern') {
+
+
Maturity Pattern Register
+
+
+
+ | Bucket |
+ Holdings |
+ Face Value |
+
+
+
+ @for (b of maturityBuckets; track b.label) {
+
+ | {{ b.label }} |
+ {{ b.count }} |
+ ₹{{ b.faceValue | number: '1.2-2' }} |
+
+ }
+
+
+
+ }
+ @if (
+ activeReport === 'govtSecList' ||
+ activeReport === 'fdSecList' ||
+ activeReport === 'shareSecList' ||
+ activeReport === 'mfList'
+ ) {
+
+
+ {{
+ activeReport === 'govtSecList'
+ ? 'Govt Security List'
+ : activeReport === 'fdSecList'
+ ? 'FD Security List'
+ : activeReport === 'shareSecList'
+ ? 'Share Security List'
+ : 'Mutual Fund List'
+ }}
+
+
+
+
+ | Cert No |
+ Script |
+ Party |
+ Face Value |
+ Rate |
+ Status |
+
+
+
+ @for (
+ h of activeReport === 'govtSecList'
+ ? govtSecList
+ : activeReport === 'fdSecList'
+ ? fdSecList
+ : activeReport === 'shareSecList'
+ ? shareSecList
+ : mutualFundList;
+ track h.certNo
+ ) {
+
+ |
+ {{ h.certNo }}
+ |
+ {{ h.scriptName }} |
+ {{ h.party }} |
+ ₹{{ h.faceValue | number: '1.2-2' }} |
+ {{ h.interestRate }}% |
+
+ {{ h.status }}
+ |
+
+ }
+
+
+
+ }
+ @if (activeReport === 'shiftingReport') {
+
+
+ Shifting Report — SLR Securities with Market Deviation ≥ 1% (AFS/HTM review candidates)
+
+
+
+
+ | Cert No |
+ Script |
+ Purchase Rate |
+ Market Price |
+ Deviation % |
+
+
+
+ @for (h of shiftingCandidates; track h.certNo) {
+
+ |
+ {{ h.certNo }}
+ |
+ {{ h.scriptName }} |
+ {{ h.purchaseRate }} |
+ {{ h.marketPrice }} |
+
+ {{ h.deviationPct }}%
+ |
+
+ } @empty {
+
+ | No securities crossing the 1% deviation threshold today. |
+
+ }
+
+
+
+ }
+ }
+
+
+ @if (activeGroup === 'portfolio') {
+
+
Investment Portfolio — Consolidated Summary
+
+
+
+ | Instrument Type |
+ Holdings |
+ Face Value |
+ Accrued Interest |
+ Maturity Value |
+
+
+
+ @for (r of portfolioSummary; track r.label) {
+
+ | {{ r.label }} |
+ {{ r.count }} |
+ ₹{{ r.faceValue | number: '1.2-2' }} |
+ ₹{{ r.accrued | number: '1.2-2' }} |
+ ₹{{ r.maturityValue | number: '1.2-2' }} |
+
+ }
+
+
+
+ | Total |
+ |
+ ₹{{ portfolioTotalFaceValue | number: '1.2-2' }} |
+ ₹{{ portfolioTotalAccrued | number: '1.2-2' }} |
+ ₹{{ portfolioTotalMaturity | number: '1.2-2' }} |
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+ @if (activeTab === 'holdings') {
+
+
Share Holdings Register
+
+
+
+ | Cert No |
+ Script |
+ Party |
+ Units |
+ Rate |
+ Face Value |
+ Purchase Date |
+ Status |
+
+
+
+ @for (h of holdings; track h.certNo) {
+
+ |
+ {{ h.certNo }}
+ |
+ {{ h.scriptName }} |
+ {{ h.party }} |
+ {{ h.units | number }} |
+ ₹{{ h.purchaseRate | number: '1.2-2' }} |
+ ₹{{ h.faceValue | number: '1.2-2' }} |
+ {{ h.purchaseDate }} |
+
+ {{ h.status }}
+ |
+
+ }
+
+
+
+ }
+
+
+ @if (activeTab === 'purchase') {
+
+ }
+
+
+ @if (activeTab === 'dividend') {
+
+ }
+
+
+ @if (activeTab === 'sell') {
+
+ }
+
+
+ @if (activeTab === 'writeoff') {
+
+
Investment - Share Write Off Entry
+
+
+ @if (writeoffHolding; as h) {
+
+ }
+
+
+
+
+
+
+ }
+
+ @if (activeTab !== 'holdings') {
+
+
Share Transaction Log
+
+
+
+ | Date |
+ Voucher No |
+ Cert No |
+ Type |
+ Particulars |
+ Amount |
+
+
+
+ @for (t of txns; track t.voucherNo) {
+
+ | {{ t.txnDate }} |
+
+ {{ t.voucherNo }}
+ |
+ {{ t.certNo }} |
+ {{ t.txnType }} |
+ {{ t.particulars }} |
+ ₹{{ t.amount | number: '1.2-2' }} |
+
+ }
+
+
+
+ }
+
{{ toastMsg }}
diff --git a/src/app/investment/share-investment/share-investment.component.ts b/src/app/investment/share-investment/share-investment.component.ts
new file mode 100644
index 000000000..f5835ee0d
--- /dev/null
+++ b/src/app/investment/share-investment/share-investment.component.ts
@@ -0,0 +1,263 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { SHARE_HOLDINGS, ALL_TXNS, InvestmentHolding, InvestmentTxn, todayDDMMYYYY } from '../investment-data';
+
+type ShareTab = 'holdings' | 'purchase' | 'dividend' | 'sell' | 'writeoff';
+
+interface SharePurchaseForm {
+ certNo: string;
+ scriptCode: string;
+ scriptName: string;
+ party: string;
+ subType: string;
+ units: number | null;
+ purchaseRate: number | null;
+ purchaseDate: string;
+ brokerCode: string;
+ crToAc: string;
+}
+
+/**
+ * Share Entry treasury screen — Holdings register + Purchase / Dividend / Sell / Write-off
+ * entry tabs (legacy "02 Share Entry" menu). Dummy in-memory data; Save appends locally.
+ */
+@Component({
+ selector: 'mifosx-share-investment',
+ templateUrl: './share-investment.component.html',
+ styleUrls: [
+ '../../cashier/cashier-shared.scss',
+ '../investment-shared.scss'
+ ],
+ standalone: true,
+ imports: [
+ CommonModule,
+ FormsModule
+ ]
+})
+export class ShareInvestmentComponent {
+ activeTab: ShareTab = 'holdings';
+ asOnDate = todayDDMMYYYY();
+
+ holdings: InvestmentHolding[] = [...SHARE_HOLDINGS];
+ txns: InvestmentTxn[] = ALL_TXNS.filter((t) => t.instrumentType === 'SHARE');
+
+ toastMsg = '';
+ toastVisible = false;
+ private toastTimer: ReturnType | undefined;
+
+ purchaseForm: SharePurchaseForm = this.blankPurchaseForm();
+ dividendCertNo = '';
+ dividendPerShare: number | null = null;
+ sellCertNo = '';
+ sellUnits: number | null = null;
+ sellRate: number | null = null;
+ writeoffCertNo = '';
+ writeoffReason = '';
+
+ setTab(tab: ShareTab): void {
+ this.activeTab = tab;
+ }
+
+ get activeHoldings(): InvestmentHolding[] {
+ return this.holdings.filter((h) => h.status === 'ACTIVE');
+ }
+
+ private blankPurchaseForm(): SharePurchaseForm {
+ return {
+ certNo: `SH-${6000 + this.holdings.length + 1}`,
+ scriptCode: '',
+ scriptName: '',
+ party: 'NSE/BSE',
+ subType: 'EQUITY',
+ units: null,
+ purchaseRate: null,
+ purchaseDate: this.asOnDate,
+ brokerCode: '',
+ crToAc: '310070'
+ };
+ }
+
+ savePurchase(): void {
+ const f = this.purchaseForm;
+ if (!f.scriptName || !f.units || !f.purchaseRate) {
+ this.toast('Please fill Script Name, No. of Units and Purchase Rate.');
+ return;
+ }
+ const faceValue = f.units * f.purchaseRate;
+ const holding: InvestmentHolding = {
+ certNo: f.certNo,
+ instrumentType: 'SHARE',
+ scriptCode: f.scriptCode || f.scriptName,
+ scriptName: f.scriptName,
+ party: f.party,
+ subType: f.subType,
+ faceValue,
+ purchaseRate: f.purchaseRate,
+ units: f.units,
+ purchaseDate: f.purchaseDate,
+ maturityDate: f.purchaseDate,
+ interestRate: 0,
+ interestFreq: 'YEARLY',
+ glCode: '310060',
+ glName: 'INVESTMENT IN SHARES',
+ crToAc: f.crToAc,
+ brokerCode: f.brokerCode,
+ status: 'ACTIVE'
+ };
+ this.holdings = [
+ holding,
+ ...this.holdings
+ ];
+ this.txns = [
+ {
+ certNo: holding.certNo,
+ instrumentType: 'SHARE',
+ txnType: 'PURCHASE',
+ voucherNo: `INV/PUR/${holding.certNo}`,
+ txnDate: f.purchaseDate,
+ amount: faceValue,
+ particulars: `Purchase of ${f.units} shares - ${holding.scriptName}`
+ },
+ ...this.txns
+ ];
+ this.toast(`Share holding ${holding.certNo} saved successfully.`);
+ this.purchaseForm = this.blankPurchaseForm();
+ this.activeTab = 'holdings';
+ }
+
+ cancelPurchase(): void {
+ this.purchaseForm = this.blankPurchaseForm();
+ }
+
+ // -------------------- Dividend --------------------
+ get dividendHolding(): InvestmentHolding | undefined {
+ return this.holdings.find((h) => h.certNo === this.dividendCertNo);
+ }
+
+ get dividendAmount(): number {
+ const h = this.dividendHolding;
+ if (!h || !this.dividendPerShare) {
+ return 0;
+ }
+ return Math.round(h.units * this.dividendPerShare);
+ }
+
+ saveDividend(): void {
+ const h = this.dividendHolding;
+ if (!h || !this.dividendPerShare) {
+ this.toast('Select a holding and enter dividend per share.');
+ return;
+ }
+ const amt = this.dividendAmount;
+ this.txns = [
+ {
+ certNo: h.certNo,
+ instrumentType: 'SHARE',
+ txnType: 'DIVIDEND',
+ voucherNo: `INV/DIV/${h.certNo}-${this.txns.length + 1}`,
+ txnDate: this.asOnDate,
+ amount: amt,
+ particulars: `Dividend received - ${h.scriptName} (₹${this.dividendPerShare}/share)`
+ },
+ ...this.txns
+ ];
+ this.toast(`Dividend of ₹${amt.toLocaleString('en-IN')} recorded for ${h.certNo}.`);
+ this.dividendCertNo = '';
+ this.dividendPerShare = null;
+ }
+
+ // -------------------- Sell --------------------
+ get sellHolding(): InvestmentHolding | undefined {
+ return this.holdings.find((h) => h.certNo === this.sellCertNo);
+ }
+
+ get sellConsideration(): number {
+ if (!this.sellUnits || !this.sellRate) {
+ return 0;
+ }
+ return Math.round(this.sellUnits * this.sellRate);
+ }
+
+ saveSell(): void {
+ const h = this.sellHolding;
+ if (!h || !this.sellUnits || !this.sellRate || this.sellUnits > h.units) {
+ this.toast('Select a holding and enter valid units (≤ held) and sell rate.');
+ return;
+ }
+ const consideration = this.sellConsideration;
+ h.units -= this.sellUnits;
+ h.faceValue = Math.round(h.units * h.purchaseRate);
+ if (h.units === 0) {
+ h.status = 'SOLD';
+ }
+ this.txns = [
+ {
+ certNo: h.certNo,
+ instrumentType: 'SHARE',
+ txnType: 'SELL',
+ voucherNo: `INV/SEL/${h.certNo}-${this.txns.length + 1}`,
+ txnDate: this.asOnDate,
+ amount: consideration,
+ particulars: `Sold ${this.sellUnits} shares of ${h.scriptName} @ ${this.sellRate}`
+ },
+ ...this.txns
+ ];
+ this.toast(`Sold ${this.sellUnits} shares. Consideration ₹${consideration.toLocaleString('en-IN')}.`);
+ this.sellCertNo = '';
+ this.sellUnits = null;
+ this.sellRate = null;
+ this.activeTab = 'holdings';
+ }
+
+ // -------------------- Write-off --------------------
+ get writeoffHolding(): InvestmentHolding | undefined {
+ return this.holdings.find((h) => h.certNo === this.writeoffCertNo);
+ }
+
+ saveWriteoff(): void {
+ const h = this.writeoffHolding;
+ if (!h || !this.writeoffReason) {
+ this.toast('Select a holding and enter a write-off reason.');
+ return;
+ }
+ h.status = 'WRITTEN_OFF';
+ this.txns = [
+ {
+ certNo: h.certNo,
+ instrumentType: 'SHARE',
+ txnType: 'WRITE_OFF',
+ voucherNo: `INV/WOF/${h.certNo}`,
+ txnDate: this.asOnDate,
+ amount: h.faceValue,
+ particulars: `Written off - ${this.writeoffReason}`
+ },
+ ...this.txns
+ ];
+ this.toast(`${h.certNo} written off.`);
+ this.writeoffCertNo = '';
+ this.writeoffReason = '';
+ this.activeTab = 'holdings';
+ }
+
+ statusClass(h: InvestmentHolding): string {
+ return `inv-badge inv-badge--${h.status.toLowerCase()}`;
+ }
+
+ private toast(msg: string): void {
+ this.toastMsg = msg;
+ this.toastVisible = true;
+ if (this.toastTimer) {
+ clearTimeout(this.toastTimer);
+ }
+ this.toastTimer = setTimeout(() => (this.toastVisible = false), 3200);
+ }
+}
diff --git a/src/environments/.env.ts b/src/environments/.env.ts
index f94dce0fc..52cc1da1e 100644
--- a/src/environments/.env.ts
+++ b/src/environments/.env.ts
@@ -10,7 +10,7 @@
export default {
'mifos_x': {
'version': '260731',
- 'hash': 'ca85bae4'
+ 'hash': 'fd28788d'
},
'allow_switching_backend_instance': true
};