diff --git a/CPRNIMS.Domain/Contracts/Finance/IRR.cs b/CPRNIMS.Domain/Contracts/Finance/IRR.cs
index bbb203f..27103d5 100644
--- a/CPRNIMS.Domain/Contracts/Finance/IRR.cs
+++ b/CPRNIMS.Domain/Contracts/Finance/IRR.cs
@@ -13,6 +13,6 @@ namespace CPRNIMS.Domain.Contracts.Finance
     {
         Task<List<ForPayment>> GetAllClosedPO(RRDetailsDto itemDto);
         Task<List<ReceivingDetail>> GetRRDetailByPO(RRDetailsDto itemDto);
-        Task<RRDetail> PostPutPayment(RRDetailsDto itemDto);
+        Task<RRDetailDto> PostPutPayment(RRDetailsDto itemDto);
     }
 }
diff --git a/CPRNIMS.Domain/Contracts/Inventory/IInventory.cs b/CPRNIMS.Domain/Contracts/Inventory/IInventory.cs
index 3b31a70..55f9472 100644
--- a/CPRNIMS.Domain/Contracts/Inventory/IInventory.cs
+++ b/CPRNIMS.Domain/Contracts/Inventory/IInventory.cs
@@ -21,7 +21,7 @@ namespace CPRNIMS.Domain.Contracts.Inventory
         Task<PagedResult<InventoryResponse>> GetInventory(InventoryRequest request, CancellationToken ct);
         Task<List<InventoryByIdResponse>> GetInventoryById(InventoryRequest itemDto, CancellationToken ct);
         Task<TransactContextDto?> GetTransactContextAsync(int inventoryId, CancellationToken ct);
-        Task<IEnumerable<DisciplineDto>> GetDisciplinesAsync(CancellationToken ct);
+        Task<IReadOnlyList<DisciplineDto>> GetDisciplinesAsync(CancellationToken ct);
         Task<Infrastructure.Entities.Inventory.Inventory> PostPutReqApproval(InventoryDto itemDto);
         Task<RequestItem> PostPutReqItems(InventoryDto itemDto);
         Task<Lot> PostPutLotNo(InventoryDto itemDto);
diff --git a/CPRNIMS.Domain/Contracts/Inventory/IMRS.cs b/CPRNIMS.Domain/Contracts/Inventory/IMRS.cs
index 9540c15..bfbfbda 100644
--- a/CPRNIMS.Domain/Contracts/Inventory/IMRS.cs
+++ b/CPRNIMS.Domain/Contracts/Inventory/IMRS.cs
@@ -12,6 +12,8 @@ namespace CPRNIMS.Domain.Contracts.Inventory
     public interface IMRS
     {
         Task<MRSPagedResult> GetPagedAsync(MRSFilterDto filter, CancellationToken ct,int? departmentId = null, string? userName = "");
+        Task<IReadOnlyList<RISSearchResultDto>> SearchRISForReturnAsync(string? risNoQuery, int? projectCodeId, CancellationToken ct);
+        Task<IReadOnlyList<ProjectCodeOptionDto>> GetProjectsWithOpenRISAsync(string? nameQuery, CancellationToken ct);
         Task<MRS?> GetByIdAsync(long mrsId, CancellationToken ct);
         Task<MRS> CreateAsync(CreateMRSRequest dto, string createdBy, CancellationToken ct);
         Task ApproveAsync(long mrsId, string approvedBy, CancellationToken ct);
diff --git a/CPRNIMS.Domain/Contracts/Items/IItem.cs b/CPRNIMS.Domain/Contracts/Items/IItem.cs
index d7e0902..f5f33ed 100644
--- a/CPRNIMS.Domain/Contracts/Items/IItem.cs
+++ b/CPRNIMS.Domain/Contracts/Items/IItem.cs
@@ -16,14 +16,14 @@ namespace CPRNIMS.Domain.Contracts.Items
         Task<List<Departments>> GetDepartment(ItemCodeDto itemCode);
         Task<PagedResult<ItemList>> GetItemList(ItemCodeDto itemCode);
         Task<List<ItemCart>> GetItemCart(ItemDto itemDto);
-        Task<List<Item>> GetItemDetail(ItemDto itemDto);
+        Task<List<ItemDtos>> GetItemDetail(ItemDto itemDto);
         Task<List<ItemLocalization>> GetItemLocalization(ItemDto itemDto);
         Task<List<ItemCategory>> GetItemCateg(ItemDto itemDto);
         Task<List<ItemColor>> GetItemColor(ItemDto itemDto);
         Task<List<UnitOfMessure>> GetItemUOM(ItemDto itemDto);
         Task<List<NotifUserKey>> GetNotifUserKey(ItemDto itemDto);
-        Task<List<ProjectCodes>> GetProjectCode();
-        Task<List<ProjectCodes>> GetProjectCodeByTerm(string? fileName);
+        Task<IReadOnlyList<ProjectCodes>> GetProjectCode();
+        Task<IReadOnlyList<ProjectCodes>> GetProjectCodeByTerm(string? fileName);
         Task<(long, long)> GetPRNo();
         Task<ResponseObject> PostPurchRequest(ItemDto itemDto);
         Task<ItemCodeDto> PostPutItem(ItemCodeDto itemDto);
diff --git a/CPRNIMS.Domain/Contracts/PO/IPurchaseOrder.cs b/CPRNIMS.Domain/Contracts/PO/IPurchaseOrder.cs
index 3f770c5..513518d 100644
--- a/CPRNIMS.Domain/Contracts/PO/IPurchaseOrder.cs
+++ b/CPRNIMS.Domain/Contracts/PO/IPurchaseOrder.cs
@@ -70,6 +70,7 @@ namespace CPRNIMS.Domain.Contracts.PO
         Task<Incoterm> PostPutIncoterms(PODto pODto);
         Task<bool> DeleteIncShip(PODto poDto);
         Task<bool> PostIncShipFollowUp(PODto pODto);
+        Task<IReadOnlyList<Currencies>> GetCurrencies(string currencyName, CancellationToken ct);
         #endregion
     }
 }
diff --git a/CPRNIMS.Domain/Contracts/Receiving/IReceiving.cs b/CPRNIMS.Domain/Contracts/Receiving/IReceiving.cs
index 75bbc8c..c1f230b 100644
--- a/CPRNIMS.Domain/Contracts/Receiving/IReceiving.cs
+++ b/CPRNIMS.Domain/Contracts/Receiving/IReceiving.cs
@@ -12,7 +12,7 @@ namespace CPRNIMS.Domain.Contracts.Receiving
     public interface IReceiving
     {
         Task<List<ReceivingDetail>> GetRRDetailByPO(ItemDto itemDto);
-        Task<List<RRDetail>> GetRRDetail(ItemDto itemDto);
+        Task<List<RRDetailDto>> GetRRDetail(ItemDto itemDto);
         Task<List<ForReceiving>> GetForReceiving(ItemDto itemDto);
         Task<List<RR>> GetRR(ItemDto itemDto);
         Task<List<RRSeries>> GetLatestRRNo(ItemDto itemDto);
diff --git a/CPRNIMS.Domain/Services/Finance/RR.cs b/CPRNIMS.Domain/Services/Finance/RR.cs
index 88e9e7b..a727cc8 100644
--- a/CPRNIMS.Domain/Services/Finance/RR.cs
+++ b/CPRNIMS.Domain/Services/Finance/RR.cs
@@ -40,7 +40,7 @@ namespace CPRNIMS.Domain.Services.Finance
             return allItems ?? new List<ReceivingDetail>();
         }
 
-        public async Task<RRDetail> PostPutPayment(RRDetailsDto itemDto)
+        public async Task<RRDetailDto> PostPutPayment(RRDetailsDto itemDto)
         {
             await _dbContext.Database
                  .ExecuteSqlRawAsync("EXEC PostPutPayment @UserId, @PONo, @POTypeId, @PRDetailsId",
@@ -48,7 +48,7 @@ namespace CPRNIMS.Domain.Services.Finance
                   new SqlParameter("@PONo", itemDto.PONo),
                   new SqlParameter("@POTypeId", itemDto.POTypeId),
                   new SqlParameter("@PRDetailsId", itemDto.PRDetailsId));
-            return new RRDetail();
+            return new RRDetailDto();
         }
     }
 }
diff --git a/CPRNIMS.Domain/Services/Inventory/Inventory.cs b/CPRNIMS.Domain/Services/Inventory/Inventory.cs
index 1cda8e5..8df5d49 100644
--- a/CPRNIMS.Domain/Services/Inventory/Inventory.cs
+++ b/CPRNIMS.Domain/Services/Inventory/Inventory.cs
@@ -3,7 +3,9 @@ using CPRNIMS.Infrastructure.Database;
 using CPRNIMS.Infrastructure.Dto.Inventory;
 using CPRNIMS.Infrastructure.Dto.Inventory.Request;
 using CPRNIMS.Infrastructure.Dto.Inventory.Response;
+using CPRNIMS.Infrastructure.Entities.Account;
 using CPRNIMS.Infrastructure.Entities.Inventory;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using System;
@@ -17,9 +19,11 @@ namespace CPRNIMS.Domain.Services.Inventory
     public class Inventory : IInventory
     {
         private readonly NonInventoryDbContext _dbContext;
-        public Inventory(NonInventoryDbContext dbContext)
+        private readonly UserManager<ApplicationUser> _userManager;
+        public Inventory(NonInventoryDbContext dbContext, UserManager<ApplicationUser> userManager)
         {
             _dbContext = dbContext;
+            _userManager = userManager;
         }
         public async Task<TransactContextDto?> GetTransactContextAsync(int inventoryId, CancellationToken ct)
         {
@@ -79,7 +83,7 @@ namespace CPRNIMS.Domain.Services.Inventory
                 .ToListAsync(ct);
 
             var disciplines = await GetDisciplinesAsync(ct);
-
+            var projectCodes = await GetProjectCodesAsync(ct);
             return new TransactContextDto
             {
                 InventoryId = inv.InventoryId,
@@ -91,13 +95,15 @@ namespace CPRNIMS.Domain.Services.Inventory
                 QtyOnHand = inv.QtyOnHand,
                 QtyIn = inv.QtyIn,
                 QtyOut = inv.QtyOut,
+                ProjectCodes = projectCodes,
                 Disciplines = disciplines,
                 OpenRISList = openRIS
             };
         }
-        public async Task<IEnumerable<DisciplineDto>> GetDisciplinesAsync(CancellationToken ct)
+        public async Task<IReadOnlyList<DisciplineDto>> GetDisciplinesAsync(CancellationToken ct)
         {
             return await _dbContext.Disciplines
+                .AsNoTracking()
                 .OrderBy(d => d.DisciplineName)
                 .Select(d => new DisciplineDto
                 {
@@ -106,6 +112,19 @@ namespace CPRNIMS.Domain.Services.Inventory
                 })
                 .ToListAsync(ct);
         }
+        public async Task<IReadOnlyList<ProjectCodeDto>> GetProjectCodesAsync(CancellationToken ct)
+        {
+            return await _dbContext.ProjectCodes
+                .Where(p => p.StatusName != "Completed" && p.IsActive)
+                .OrderBy(d => d.ProjectName)
+                .Select(d => new ProjectCodeDto
+                {
+                    ProjectCodeId = d.ProjectCodeId,
+                    ProjectCode = d.ProjectCode ?? "N/A",
+                    ProjectName = d.ProjectName ?? "N/A"
+                })
+                .ToListAsync(ct);
+        }
         public async Task<List<ItemDetail>> GetInventoryById(InventoryDto itemDto)
         {
             var allItems = await _dbContext.ItemDetails
diff --git a/CPRNIMS.Domain/Services/Inventory/InventoryReports.cs b/CPRNIMS.Domain/Services/Inventory/InventoryReports.cs
index 2dcd900..a00245d 100644
--- a/CPRNIMS.Domain/Services/Inventory/InventoryReports.cs
+++ b/CPRNIMS.Domain/Services/Inventory/InventoryReports.cs
@@ -1,6 +1,7 @@
 using CPRNIMS.Domain.Contracts.Inventory;
 using CPRNIMS.Infrastructure.Database;
 using CPRNIMS.Infrastructure.Dto.Inventory.Reports;
+using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 
 namespace CPRNIMS.Domain.Services.Inventory
@@ -43,7 +44,7 @@ namespace CPRNIMS.Domain.Services.Inventory
                     ItemName = r.PRDetail != null ? r.PRDetail.ItemName : "—",
                     ItemNo = r.Inventory.ItemNo,
                     DisciplineName = r.Discipline.DisciplineName,
-                    IssuedTo = r.IssuedTo,
+                    ProjectName = r.ProjectCodes.ProjectName,
                     QtyIssued = r.QtyIssued,
                     TotalReturned = r.MaterialReturns
                                        .Where(m => m.Status != 2)
@@ -79,7 +80,7 @@ namespace CPRNIMS.Domain.Services.Inventory
                 .ToList();
 
             var topRecipients = rows
-                .GroupBy(r => r.IssuedTo)
+                .GroupBy(r => r.ProjectName)
                 .Select(g => new TopRecipient
                 {
                     IssuedTo = g.Key,
@@ -187,108 +188,104 @@ namespace CPRNIMS.Domain.Services.Inventory
         public async Task<InventoryReportDto> GetInventoryReportAsync(DateTime dateFrom, DateTime dateTo, CancellationToken ct,
                                                                         int? departmentId = null, string? userName = "")
         {
-            var endDate = dateTo.Date.AddDays(1);
-
-            var allowedAllDeptUsers = new[] { "LSKRISUR24", "LSCYNDIZ25", "LSJONTAN25" , "LHRIOCAS24" };
+            var allowedAllDeptUsers = new[] { "LSKRISUR24", "LSCYNDIZ25", "LSJONTAN25", "LHRIOCAS24" };
             bool seeAllDepartments = !string.IsNullOrWhiteSpace(userName)
                 && allowedAllDeptUsers.Contains(userName, StringComparer.OrdinalIgnoreCase);
 
-            var query = _db.InventTransDetails
-                .Where(itd =>
-                    itd.IsActive &&
-                    itd.InventTrans.IsActive &&
-                    itd.InventTrans.Inventory.IsActive &&
-                    itd.CreatedDate >= dateFrom &&
-                    itd.CreatedDate < endDate);
-
-            if (departmentId.HasValue && !seeAllDepartments)
-            {
-                query = query.Where(itd =>
-                    itd.InventTrans.Inventory.User.DepartmentId == departmentId.Value);
-            }
-
-            var rawRows = await query
-                .Select(itd => new
-                {
-                    itd.InventTrans.Inventory.InventoryId,
-                    itd.InventTrans.Inventory.ItemNo,
-                    itd.InventTrans.Inventory.QtyIn,
-                    itd.InventTrans.Inventory.QtyOut,
-                    itd.InventTrans.Inventory.QtyOnHand,
-                    LotNo = itd.InventTrans.Inventory.Lot != null
-                        ? itd.InventTrans.Inventory.Lot.LotName
-                        : null,
-                    ItemName = itd.InventTrans.Inventory.Item.ItemCode.ItemName ?? "None",
-                    ItemCategoryName =
-                        itd.InventTrans.Inventory.Item.ItemCode.ItemCategory.ItemCategoryName ?? "None",
-                    itd.CreatedDate
-                })
-                .ToListAsync(ct);
-
-            // De-duplicate: one row per Inventory (latest trans detail wins for the date shown)
-            var rows = rawRows
-                .GroupBy(r => r.InventoryId)
-                .Select(g =>
-                {
-                    var inv = g.OrderByDescending(x => x.CreatedDate).First();
-                    return new InventoryReportRow
-                    {
-                        ItemName = inv.ItemName,
-                        ItemNo = inv.ItemNo,
-                        ItemCategoryName = inv.ItemCategoryName,
-                        LotNo = inv.LotNo,
-                        QtyIn = inv.QtyIn,
-                        QtyOut = inv.QtyOut,
-                        QtyOnHand = inv.QtyOnHand,
-                        StockPct = inv.QtyIn > 0
-                            ? (int)Math.Round(Math.Max(0, Math.Min(100, (inv.QtyOnHand / inv.QtyIn) * 100)))
-                            : 0
-                    };
-                })
-                .OrderBy(r => r.ItemName)
-                .ToList();
-
-            var summary = new InventoryReportSummary
-            {
-                TotalSKUs = rows.Count,
-                TotalOnHand = rows.Sum(r => r.QtyOnHand),
-                TotalQtyIn = rows.Sum(r => r.QtyIn),
-                TotalQtyOut = rows.Sum(r => r.QtyOut),
-                LowStockCount = rows.Count(r => r.StockPct < 20 && r.QtyOnHand > 0),
-                OutOfStockCount = rows.Count(r => r.QtyOnHand <= 0)
-            };
-
-            var byCategory = rows
-                .GroupBy(r => r.ItemCategoryName)
-                .Select(g => new CategoryStockLevel
-                {
-                    CategoryName = g.Key,
-                    AvgStockPct = (int)Math.Round(g.Average(r => r.StockPct))
-                })
-                .OrderByDescending(c => c.AvgStockPct)
-                .ToList();
-
-            var alerts = rows
-                .Where(r => r.StockPct < 20)
-                .OrderBy(r => r.StockPct)
-                .Take(10)
-                .Select(r => new InventoryAlert
-                {
-                    ItemName = r.ItemName,
-                    QtyOnHand = r.QtyOnHand,
-                    Severity = r.QtyOnHand <= 0 ? "Critical" : "Low"
-                })
-                .ToList();
-
-            return new InventoryReportDto
+            var dto = new InventoryReportDto
             {
                 ReportNo = $"RPT-INV-{DateTime.Now:yyyyMM}-{Random.Shared.Next(1, 999):D3}",
-                AsOf = dateTo.Date,   // reflect the requested period end, not always today
-                Summary = summary,
-                Rows = rows,
-                ByCategory = byCategory,
-                Alerts = alerts
+                AsOf = dateTo.Date,
+                Rows = new List<InventoryReportRow>(),
+                ByCategory = new List<CategoryStockLevel>(),
+                Alerts = new List<InventoryAlert>(),
+                Summary = new InventoryReportSummary()
             };
+
+            var conn = _db.Database.GetDbConnection();
+            await using var cmd = conn.CreateCommand();
+            cmd.CommandText = "dbo.GetInventoryReport";
+            cmd.CommandType = System.Data.CommandType.StoredProcedure;
+
+            cmd.Parameters.Add(new SqlParameter("@DateFrom", dateFrom));
+            cmd.Parameters.Add(new SqlParameter("@DateTo", dateTo));
+            cmd.Parameters.Add(new SqlParameter("@DepartmentId", (object?)departmentId ?? DBNull.Value));
+            cmd.Parameters.Add(new SqlParameter("@SeeAllDepartments", seeAllDepartments ? 1 : 0));
+
+            if (conn.State != System.Data.ConnectionState.Open)
+                await conn.OpenAsync(ct);
+
+            try
+            {
+                await using var reader = await cmd.ExecuteReaderAsync(ct);
+
+                // 1: detail rows
+                while (await reader.ReadAsync(ct))
+                {
+                    dto.Rows.Add(new InventoryReportRow
+                    {
+                        ItemName = reader.GetString(reader.GetOrdinal("ItemName")),
+                        ItemNo = reader.GetInt64(reader.GetOrdinal("ItemNo")),
+                        ItemCategoryName = reader.GetString(reader.GetOrdinal("ItemCategoryName")),
+                        LotNo = reader.IsDBNull(reader.GetOrdinal("LotNo"))
+                                               ? null : reader.GetString(reader.GetOrdinal("LotNo")),
+                        QtyIn = reader.GetDecimal(reader.GetOrdinal("QtyIn")),
+                        QtyOut = reader.GetDecimal(reader.GetOrdinal("QtyOut")),
+                        QtyOnHand = reader.GetDecimal(reader.GetOrdinal("QtyOnHand")),
+                        UnitPrice = reader.GetDecimal(reader.GetOrdinal("UnitPrice")),
+                        StockPct = reader.GetInt32(reader.GetOrdinal("StockPct"))
+                    });
+                }
+
+                // 2: summary
+                if (await reader.NextResultAsync(ct) && await reader.ReadAsync(ct))
+                {
+                    dto.Summary = new InventoryReportSummary
+                    {
+                        TotalSKUs = reader.GetInt32(reader.GetOrdinal("TotalSKUs")),
+                        TotalOnHand = reader.GetDecimal(reader.GetOrdinal("TotalOnHand")),
+                        TotalQtyIn = reader.GetDecimal(reader.GetOrdinal("TotalQtyIn")),
+                        TotalQtyOut = reader.GetDecimal(reader.GetOrdinal("TotalQtyOut")),
+                        TotalValue = reader.GetDecimal(reader.GetOrdinal("TotalValue")),
+                        LowStockCount = reader.GetInt32(reader.GetOrdinal("LowStockCount")),
+                        OutOfStockCount = reader.GetInt32(reader.GetOrdinal("OutOfStockCount"))
+                    };
+                }
+
+                // 3: by category
+                if (await reader.NextResultAsync(ct))
+                {
+                    while (await reader.ReadAsync(ct))
+                    {
+                        dto.ByCategory.Add(new CategoryStockLevel
+                        {
+                            CategoryName = reader.GetString(reader.GetOrdinal("CategoryName")),
+                            AvgStockPct = reader.GetInt32(reader.GetOrdinal("AvgStockPct"))
+                        });
+                    }
+                }
+
+                // 4: alerts
+                if (await reader.NextResultAsync(ct))
+                {
+                    while (await reader.ReadAsync(ct))
+                    {
+                        dto.Alerts.Add(new InventoryAlert
+                        {
+                            ItemName = reader.GetString(reader.GetOrdinal("ItemName")),
+                            QtyOnHand = reader.GetDecimal(reader.GetOrdinal("QtyOnHand")),
+                            Severity = reader.GetString(reader.GetOrdinal("Severity"))
+                        });
+                    }
+                }
+            }
+            finally
+            {
+                if (conn.State == System.Data.ConnectionState.Open)
+                    await conn.CloseAsync();
+            }
+
+            return dto;
         }
     }
 }
diff --git a/CPRNIMS.Domain/Services/Inventory/MRS.cs b/CPRNIMS.Domain/Services/Inventory/MRS.cs
index 13801bb..750f781 100644
--- a/CPRNIMS.Domain/Services/Inventory/MRS.cs
+++ b/CPRNIMS.Domain/Services/Inventory/MRS.cs
@@ -19,6 +19,17 @@ namespace CPRNIMS.Domain.Services.Inventory
         }
         public async Task ApproveAsync(long mrsId, string approvedBy, CancellationToken ct)
         {
+            //var user = await _userManager.FindByNameAsync(approvedBy);
+            //if (user != null)
+            //{
+            //    bool isApprover2 = await _userManager.IsInRoleAsync(user, "APPROVER2");
+
+            //    if (!isApprover2)
+            //    {
+            //        throw new Exception("You have no permission to approve this item.");
+            //    }
+            //}
+
             var rms = await _db.MRS.FindAsync(mrsId)
                 ?? throw new InvalidOperationException("MRS not found.");
 
@@ -34,6 +45,17 @@ namespace CPRNIMS.Domain.Services.Inventory
 
         public async Task CancelAsync(CancelMRSRequest request,string canceledBy, CancellationToken ct)
         {
+            //var user = await _userManager.FindByNameAsync(canceledBy);
+            //if (user != null)
+            //{
+            //    bool isApprover2 = await _userManager.IsInRoleAsync(user, "APPROVER2");
+
+            //    if (!isApprover2)
+            //    {
+            //        throw new Exception("You have no permission to cancel this item.");
+            //    }
+            //}
+
             await _transactionFacade.ExecuteAsync(async () =>
             {
                 var mrs = await _db.MRS
@@ -78,7 +100,7 @@ namespace CPRNIMS.Domain.Services.Inventory
                     QtyReturned = dto.QtyReturned,
                     Condition = dto.Condition,
                     Remarks = dto.Remarks,
-                    Status = 0,
+                    Status = 1,//Matic Approve for now
                     CreatedBy = createdBy,
                     CreatedDate = DateTime.Now
                 };
@@ -177,7 +199,6 @@ namespace CPRNIMS.Domain.Services.Inventory
 
             return new MRSPagedResult { Data = data, RecordsTotal = total };
         }
-
         private async Task<string> GenerateMRSNoAsync()
         {
             var year = DateTime.Now.Year;
@@ -185,5 +206,55 @@ namespace CPRNIMS.Domain.Services.Inventory
             var count = await _db.MRS.CountAsync(m => m.CreatedDate.Year == year) + 1;
             return $"MRS-{year}{month}-{count:D4}";
         }
+        public async Task<IReadOnlyList<RISSearchResultDto>> SearchRISForReturnAsync(string? risNoQuery, int? projectCodeId, CancellationToken ct)
+        {
+            var query = _db.RIS
+                .Where(r => r.Status == 1);
+
+            if (projectCodeId.HasValue)
+                query = query.Where(r => r.ProjectCodeId == projectCodeId.Value);
+
+            if (!string.IsNullOrWhiteSpace(risNoQuery))
+                query = query.Where(r => r.RISNo.Contains(risNoQuery));
+
+            return await query
+                .Select(r => new RISSearchResultDto
+                {
+                    RISId = r.RISId,
+                    RISNo = r.RISNo,
+                    ProjectCodeId = r.ProjectCodeId,
+                    ProjectCode = r.ProjectCodes.ProjectCode ?? "N/A",
+                    ProjectName = r.ProjectCodes.ProjectName ?? "N/A",
+                    DisciplineName = r.Discipline.DisciplineName,
+                    QtyAvailableToReturn = r.QtyIssued - r.MaterialReturns.Sum(m => m.QtyReturned)
+                })
+                .Where(r => r.QtyAvailableToReturn > 0)
+                .OrderByDescending(r => r.RISId)
+                .Take(20) 
+                .ToListAsync(ct);
+        }
+
+        public async Task<IReadOnlyList<ProjectCodeOptionDto>> GetProjectsWithOpenRISAsync(string? nameQuery, CancellationToken ct)
+        {
+            var query = _db.RIS
+                .Where(r => r.Status == 1 && r.QtyIssued > r.MaterialReturns.Sum(m => m.QtyReturned));
+
+            if (!string.IsNullOrWhiteSpace(nameQuery))
+                query = query.Where(r =>
+                    r.ProjectCodes.ProjectName.Contains(nameQuery) ||
+                    r.ProjectCodes.ProjectCode.Contains(nameQuery));
+
+            return await query
+                .Select(r => new ProjectCodeOptionDto
+                {
+                    ProjectCodeId = r.ProjectCodeId,
+                    ProjectCode = r.ProjectCodes.ProjectCode ?? "N/A",
+                    ProjectName = r.ProjectCodes.ProjectName ?? "N/A"
+                })
+                .Distinct()
+                .OrderBy(p => p.ProjectName)
+                .Take(20)
+                .ToListAsync(ct);
+        }
     }
 }
diff --git a/CPRNIMS.Domain/Services/Inventory/RIS.cs b/CPRNIMS.Domain/Services/Inventory/RIS.cs
index 5f32441..55e48ae 100644
--- a/CPRNIMS.Domain/Services/Inventory/RIS.cs
+++ b/CPRNIMS.Domain/Services/Inventory/RIS.cs
@@ -42,11 +42,11 @@ namespace CPRNIMS.Domain.Services.Inventory
                     RISNo = risNo,
                     InventoryId = dto.InventoryId,
                     PRDetailId = dto.PRDetailId,
-                    IssuedTo = dto.IssuedTo,
+                    ProjectCodeId = dto.ProjectCodeId,
                     DisciplineId = dto.DisciplineId,
                     QtyIssued = dto.QtyIssued,
                     Remarks = dto.Remarks,
-                    Status = 0,
+                    Status = 1,//Approved alredy 0 is Draft
                     CreatedBy = createdBy,
                     CreatedDate = DateTime.Now
                 };
@@ -78,6 +78,17 @@ namespace CPRNIMS.Domain.Services.Inventory
 
         public async Task ApproveAsync(ApproveRISRequest request, string approvedBy, CancellationToken ct)
         {
+            //var user = await _userManager.FindByNameAsync(approvedBy);
+            //if (user != null)
+            //{
+            //    bool isApprover2 = await _userManager.IsInRoleAsync(user, "APPROVER2");
+
+            //    if (!isApprover2)
+            //    {
+            //        throw new Exception("You have no permission to approved this item.");
+            //    }
+            //}
+
             var ris = await _db.RIS.FindAsync(request.RISId, ct)
                 ?? throw new InvalidOperationException("RIS not found.");
 
@@ -93,6 +104,17 @@ namespace CPRNIMS.Domain.Services.Inventory
 
         public async Task CancelAsync(CancelRISRequest request,string canceledBy, CancellationToken ct)
         {
+            //var user = await _userManager.FindByNameAsync(canceledBy);
+            //if (user != null)
+            //{
+            //    bool isApprover2 = await _userManager.IsInRoleAsync(user, "APPROVER2");
+
+            //    if (!isApprover2)
+            //    {
+            //        throw new Exception("You have no permission to cancel this item.");
+            //    }
+            //}
+
             await _transactionFacade.ExecuteAsync(async () =>
             {
                 var ris = await _db.RIS
@@ -189,9 +211,10 @@ namespace CPRNIMS.Domain.Services.Inventory
                         .Any(d => d.PRDetails != null &&
                                   d.PRDetails.ItemName.Contains(filter.SearchItemName)));
 
-            // Issued To
+            // Issued To is Project code/name
             if (!string.IsNullOrWhiteSpace(filter.SearchIssuedTo))
-                q = q.Where(r => r.IssuedTo.Contains(filter.SearchIssuedTo));
+                q = q.Where(r => r.ProjectCodes.ProjectCode.Contains(filter.SearchIssuedTo)
+                    || r.ProjectCodes.ProjectName.Contains(filter.SearchIssuedTo));
 
             // Discipline
             if (!string.IsNullOrWhiteSpace(filter.Discipline))
@@ -220,7 +243,8 @@ namespace CPRNIMS.Domain.Services.Inventory
                                       .FirstOrDefault() ?? "—",
                     ItemNo = r.Inventory.ItemNo,
                     LotNo = r.Inventory.Lot != null ? r.Inventory.Lot.LotName : null,
-                    IssuedTo = r.IssuedTo,
+                    ProjectName = r.ProjectCodes.ProjectName,
+                    ProjectCode = r.ProjectCodes.ProjectCode,
                     DisciplineName = r.Discipline.DisciplineName,
                     DisciplineId = r.DisciplineId,
                     QtyIssued = r.QtyIssued,
@@ -253,7 +277,7 @@ namespace CPRNIMS.Domain.Services.Inventory
                 DisciplineList = disciplines
             };
         }
-        public async Task<IEnumerable<DisciplineDto>> GetDisciplinesAsync(CancellationToken ct)
+        public async Task<IReadOnlyList<DisciplineDto>> GetDisciplinesAsync(CancellationToken ct)
         {
             return await _db.Disciplines
                 .OrderBy(d => d.DisciplineName)
@@ -264,6 +288,19 @@ namespace CPRNIMS.Domain.Services.Inventory
                 })
                 .ToListAsync(ct);
         }
+        public async Task<IReadOnlyList<ProjectCodeDto>> GetProjectCodesAsync(CancellationToken ct)
+        {
+            return await _db.ProjectCodes
+                .Where(p=>p.StatusName !="Completed")
+                .OrderBy(d => d.ProjectName)
+                .Select(d => new ProjectCodeDto
+                {
+                    ProjectCodeId= d.ProjectCodeId,
+                    ProjectCode = d.ProjectCode ?? "N/A",
+                    ProjectName = d.ProjectName ?? "N/A"
+                })
+                .ToListAsync(ct);
+        }
         public async Task<RISResponse?> GetByIdAsync(long risId, CancellationToken ct)
         { 
              return  await _db.RIS
@@ -273,7 +310,7 @@ namespace CPRNIMS.Domain.Services.Inventory
                     RISId = r.RISId,
                     RISNo = r.RISNo,
                     InventoryId = r.InventoryId,
-                    IssuedTo = r.IssuedTo,
+                    ProjectCodeId = r.ProjectCodeId,
                     DisciplineName = r.Discipline.DisciplineName,
                     DisciplineId = r.DisciplineId,
                     QtyIssued = r.QtyIssued,
diff --git a/CPRNIMS.Domain/Services/Items/Item.cs b/CPRNIMS.Domain/Services/Items/Item.cs
index 98e90f5..20fd0e6 100644
--- a/CPRNIMS.Domain/Services/Items/Item.cs
+++ b/CPRNIMS.Domain/Services/Items/Item.cs
@@ -63,7 +63,6 @@ namespace CPRNIMS.Domain.Services.Items
                 UserId = itemDto.UserId
             };
         }
-
         public async Task<Infrastructure.Entities.Items.Item> PutItemDetail(ItemDto itemDto)
         {
             await _dbContext.Database
@@ -92,126 +91,6 @@ namespace CPRNIMS.Domain.Services.Items
 
             return new Infrastructure.Entities.Items.Item();
         }
-        public async Task<List<ItemLocalization>> GetItemLocalization(ItemDto itemDto)
-        {
-            var localizations = await _dbContext.ItemLocalizations
-                .Where(ic => ic.IsActive == true &&
-                EF.Functions.Like(ic.ItemLocalName, $"%{itemDto.ItemLocalName}%"))
-                .Take(15)
-                .ToListAsync();
-
-            return localizations ?? new List<ItemLocalization>();
-        }
-        public async Task<List<ItemCategory>> GetItemCateg(ItemDto itemDto)
-        {
-            if (itemDto.ItemCategoryId == 0 || itemDto.ItemCategoryId == null)
-            {
-                var categories = await _dbContext.ItemCategories
-                        .Where(ic => ic.IsActive == true)
-                        .ToListAsync();
-                return categories ?? new List<ItemCategory>();
-            }
-            else
-            {
-                var categories = await _dbContext.ItemCategories
-                           .Where(ic => ic.IsActive == true && ic.ItemCategoryId == itemDto.ItemCategoryId)
-                           .ToListAsync();
-                return categories ?? new List<ItemCategory>();
-            }
-        }
-
-        public async Task<List<Infrastructure.Entities.Items.Item>> GetItemDetail(ItemDto itemDto)
-        {
-            var allItems = await _dbContext.Items
-                   .FromSqlRaw($"EXEC GetItemDetail @ItemCodeId,@UserId",
-                   new SqlParameter("@ItemCodeId", itemDto.ItemCodeId),
-                   new SqlParameter("@UserId", itemDto.UserId))
-                   .ToListAsync();
-
-            return allItems ?? new List<Infrastructure.Entities.Items.Item>();
-        }
-
-        public async Task<PagedResult<ItemList>> GetItemList(ItemCodeDto dto)
-        {
-            var parameters = new[]
-            {
-                new SqlParameter("@UserId",          dto.UserId),
-                new SqlParameter("@SearchItemNo",    dto.SearchItemNo     ?? ""),
-                new SqlParameter("@SearchItemName",  dto.SearchItemName ?? ""),
-                new SqlParameter("@SearchCategory",  dto.SearchCategory ?? ""),
-                new SqlParameter("@PageNumber",      dto.PageNumber),
-                new SqlParameter("@PageSize",        dto.PageSize)
-            };
-
-            int totalCount = 0;
-            var items = new List<ItemList>();
-            var categoryList = new List<string>();
-
-            // Use ADO.NET to read two result sets
-            var conn = _dbContext.Database.GetDbConnection();
-            await conn.OpenAsync();
-
-            using var cmd = conn.CreateCommand();
-            cmd.CommandText = "EXEC GetItemList @UserId, @SearchItemNo,@SearchItemName,@SearchCategory, @PageNumber, @PageSize";
-            foreach (var p in parameters) cmd.Parameters.Add(p);
-            cmd.CommandTimeout = 60;
-
-            using var reader = await cmd.ExecuteReaderAsync();
-
-            while (await reader.ReadAsync())
-                categoryList.Add(reader.GetString(0));
-
-            await reader.NextResultAsync();
-
-            if (await reader.ReadAsync())
-                totalCount = reader.GetInt32(0);
-
-            await reader.NextResultAsync();
-
-            while (await reader.ReadAsync())
-            {
-                items.Add(new ItemList
-                {
-                    ItemCodeId = Convert.ToInt64(reader["ItemCodeId"]),
-                    ItemNo = Convert.ToInt64(reader["ItemNo"]),
-                    ItemName = reader["ItemName"]?.ToString(),
-                    ItemDescription = reader["ItemDescription"]?.ToString(),
-                    ItemCategoryName = reader["ItemCategoryName"]?.ToString(),
-                    CartItemCount = Convert.ToInt32(reader["CartItemCount"])
-                });
-            }
-            await conn.CloseAsync();
-
-            return new PagedResult<ItemList>
-            {
-                Data = items,
-                TotalCount = totalCount,
-                CategoryList= categoryList,
-                PageNumber = dto.PageNumber,
-                PageSize = dto.PageSize
-            };
-        }
-        public async Task<List<ItemColor>> GetItemColor(ItemDto itemDto)
-        {
-            var colors = await _dbContext.ItemColors
-                   .Where(ic => EF.Functions.Like(ic.ItemColorName, $"%{itemDto.ItemColorName}%"))
-                   .Take(5)
-                   .ToListAsync();
-
-            return colors ?? new List<ItemColor>();
-        }
-
-        public async Task<List<UnitOfMessure>> GetItemUOM(ItemDto itemDto)
-        {
-            var uoms = await _dbContext.UnitOfMessures
-                  .Where(ic => ic.IsActive == true &&
-                  EF.Functions.Like(ic.UOMName, $"%{itemDto.UOMName}%"))
-                  .Take(150)
-                  .ToListAsync();
-
-            return uoms ?? new List<UnitOfMessure>();
-        }
-
         public async Task<ItemAttachement> PostPutItemPath(ItemDto itemDto)
         {
             var isExist = await _dbContext.ItemAttachements
@@ -243,19 +122,6 @@ namespace CPRNIMS.Domain.Services.Items
                  new SqlParameter("@ItemLocalId", itemDto.ItemLocalId));
             return new ItemCart();
         }
-
-        public async Task<List<ItemCart>> GetItemCart(ItemDto itemDto)
-        {
-            var allItems = await _dbContext.ItemCarts
-                  .FromSqlRaw($"EXEC GetItemCart @UserId,@RequestTypeId,@IsCount",
-                  new SqlParameter("@UserId", itemDto.UserId),
-                  new SqlParameter("@RequestTypeId", itemDto.RequestTypeId),
-                  new SqlParameter("@IsCount", itemDto.IsCount))
-                  .ToListAsync();
-
-            return allItems ?? new List<ItemCart>();
-        }
-
         public async Task<ResponseObject> PostPurchRequest(ItemDto itemDto)
         {
             var (messCode, message) = OutputParamMessage.CreateOutputParams();
@@ -321,8 +187,23 @@ namespace CPRNIMS.Domain.Services.Items
                 existing.FileName = attach.FileName;
             }
             await _dbContext.SaveChangesAsync();
+        }   
+        Task<ItemCart> IItem.PostPutItemPath(ItemDto itemDto)
+        {
+            throw new NotImplementedException();
         }
-        public async Task<(long,long)> GetPRNo()
+        public async Task<List<ItemCart>> GetItemCart(ItemDto itemDto)
+        {
+            var allItems = await _dbContext.ItemCarts
+                  .FromSqlRaw($"EXEC GetItemCart @UserId,@RequestTypeId,@IsCount",
+                  new SqlParameter("@UserId", itemDto.UserId),
+                  new SqlParameter("@RequestTypeId", itemDto.RequestTypeId),
+                  new SqlParameter("@IsCount", itemDto.IsCount))
+                  .ToListAsync();
+
+            return allItems ?? new List<ItemCart>();
+        }
+        public async Task<(long, long)> GetPRNo()
         {
             try
             {
@@ -332,9 +213,9 @@ namespace CPRNIMS.Domain.Services.Items
                           .FirstOrDefaultAsync();
 
                 if (latestPR != null)
-                    return (latestPR.PRNo + 1,latestPR.PRId + 1);
+                    return (latestPR.PRNo + 1, latestPR.PRId + 1);
                 else
-                    return (0,0);
+                    return (0, 0);
             }
             catch (Exception ex)
             {
@@ -343,11 +224,122 @@ namespace CPRNIMS.Domain.Services.Items
             }
 
         }
-        Task<ItemCart> IItem.PostPutItemPath(ItemDto itemDto)
+        public async Task<List<ItemLocalization>> GetItemLocalization(ItemDto itemDto)
         {
-            throw new NotImplementedException();
-        }
+            var localizations = await _dbContext.ItemLocalizations
+                .Where(ic => ic.IsActive == true &&
+                EF.Functions.Like(ic.ItemLocalName, $"%{itemDto.ItemLocalName}%"))
+                .Take(15)
+                .ToListAsync();
 
+            return localizations ?? new List<ItemLocalization>();
+        }
+        public async Task<List<ItemCategory>> GetItemCateg(ItemDto itemDto)
+        {
+            if (itemDto.ItemCategoryId == 0 || itemDto.ItemCategoryId == null)
+            {
+                var categories = await _dbContext.ItemCategories
+                        .Where(ic => ic.IsActive == true)
+                        .ToListAsync();
+                return categories ?? new List<ItemCategory>();
+            }
+            else
+            {
+                var categories = await _dbContext.ItemCategories
+                           .Where(ic => ic.IsActive == true && ic.ItemCategoryId == itemDto.ItemCategoryId)
+                           .ToListAsync();
+                return categories ?? new List<ItemCategory>();
+            }
+        }
+        public async Task<List<ItemDtos>> GetItemDetail(ItemDto itemDto)
+        {
+            var allItems = await _dbContext.ItemDtos
+                   .FromSqlRaw($"EXEC GetItemDetail @ItemCodeId,@UserId",
+                   new SqlParameter("@ItemCodeId", itemDto.ItemCodeId),
+                   new SqlParameter("@UserId", itemDto.UserId))
+                   .ToListAsync();
+
+            return allItems ?? new List<ItemDtos>();
+        }
+        public async Task<PagedResult<ItemList>> GetItemList(ItemCodeDto dto)
+        {
+            var parameters = new[]
+            {
+                new SqlParameter("@UserId",          dto.UserId),
+                new SqlParameter("@SearchItemNo",    dto.SearchItemNo     ?? ""),
+                new SqlParameter("@SearchItemName",  dto.SearchItemName ?? ""),
+                new SqlParameter("@SearchCategory",  dto.SearchCategory ?? ""),
+                new SqlParameter("@PageNumber",      dto.PageNumber),
+                new SqlParameter("@PageSize",        dto.PageSize)
+            };
+
+            int totalCount = 0;
+            var items = new List<ItemList>();
+            var categoryList = new List<string>();
+
+            // Use ADO.NET to read two result sets
+            var conn = _dbContext.Database.GetDbConnection();
+            await conn.OpenAsync();
+
+            using var cmd = conn.CreateCommand();
+            cmd.CommandText = "EXEC GetItemList @UserId, @SearchItemNo,@SearchItemName,@SearchCategory, @PageNumber, @PageSize";
+            foreach (var p in parameters) cmd.Parameters.Add(p);
+            cmd.CommandTimeout = 60;
+
+            using var reader = await cmd.ExecuteReaderAsync();
+
+            while (await reader.ReadAsync())
+                categoryList.Add(reader.GetString(0));
+
+            await reader.NextResultAsync();
+
+            if (await reader.ReadAsync())
+                totalCount = reader.GetInt32(0);
+
+            await reader.NextResultAsync();
+
+            while (await reader.ReadAsync())
+            {
+                items.Add(new ItemList
+                {
+                    ItemCodeId = Convert.ToInt64(reader["ItemCodeId"]),
+                    ItemNo = Convert.ToInt64(reader["ItemNo"]),
+                    ItemName = reader["ItemName"]?.ToString(),
+                    ItemDescription = reader["ItemDescription"]?.ToString(),
+                    ItemCategoryName = reader["ItemCategoryName"]?.ToString(),
+                    CartItemCount = Convert.ToInt32(reader["CartItemCount"])
+                });
+            }
+            await conn.CloseAsync();
+
+            return new PagedResult<ItemList>
+            {
+                Data = items,
+                TotalCount = totalCount,
+                CategoryList = categoryList,
+                PageNumber = dto.PageNumber,
+                PageSize = dto.PageSize
+            };
+        }
+        public async Task<List<ItemColor>> GetItemColor(ItemDto itemDto)
+        {
+            var colors = await _dbContext.ItemColors
+                   .Where(ic => EF.Functions.Like(ic.ItemColorName, $"%{itemDto.ItemColorName}%"))
+                   .Take(5)
+                   .ToListAsync();
+
+            return colors ?? new List<ItemColor>();
+        }
+        public async Task<List<UnitOfMessure>> GetItemUOM(ItemDto itemDto)
+        {
+            var uoms = await _dbContext.UnitOfMessures
+                  .Where(ic => ic.IsActive == true &&
+                  EF.Functions.Like(ic.UOMName, $"%{itemDto.UOMName}%"))
+                  .Take(150)
+                  .ToListAsync();
+
+            return uoms ?? new List<UnitOfMessure>();
+        }
         public async Task <List<Departments>> GetDepartment(ItemCodeDto itemCode)
         {
             return await _dbContext.Departments
@@ -366,18 +358,18 @@ namespace CPRNIMS.Domain.Services.Items
 
             return allItems ?? new List<NotifUserKey>();
         }
-
-        public async Task<List<ProjectCodes>> GetProjectCode()
+        public async Task<IReadOnlyList<ProjectCodes>> GetProjectCode()
         {
             return  await _dbContext.ProjectCodes
                            .AsNoTracking()
                            .ToListAsync();
         }
-        public async Task<List<ProjectCodes>> GetProjectCodeByTerm(string? term)
+        public async Task<IReadOnlyList<ProjectCodes>> GetProjectCodeByTerm(string? term)
         {
             return await _dbContext.ProjectCodes
                                    .AsNoTracking()
-                                   .Where(p => EF.Functions.Like(p.ProjectCode, $"%{term}%"))
+                                   .Where(p => p.StatusName != "Completed" && p.IsActive
+                                   && EF.Functions.Like(p.ProjectCode, $"%{term}%"))
                                    .ToListAsync();
         }
     }
diff --git a/CPRNIMS.Domain/Services/PO/PurchaseOrder.cs b/CPRNIMS.Domain/Services/PO/PurchaseOrder.cs
index 0e0b9bb..d963df2 100644
--- a/CPRNIMS.Domain/Services/PO/PurchaseOrder.cs
+++ b/CPRNIMS.Domain/Services/PO/PurchaseOrder.cs
@@ -30,6 +30,14 @@ namespace CPRNIMS.Domain.Services.PO
             _smptHelper = smptHelper;
         }
         #region Get
+
+        public async Task<IReadOnlyList<Currencies>> GetCurrencies(string currencyName, CancellationToken ct)
+        {
+            return await _dbContext.Currencies.AsNoTracking()
+                .Where(c => c.IsActive==true &&
+                            (string.IsNullOrEmpty(currencyName) || c.CurrencyName.Contains(currencyName)))
+                .ToListAsync(ct);
+        }
         public async Task<POFormData> GetPOFormDataAsync(long? poId)
         {
             // Reuse the connection from your existing DbContext
@@ -493,7 +501,7 @@ namespace CPRNIMS.Domain.Services.PO
             await _dbContext.Database
                .ExecuteSqlRawAsync("EXEC PostPutCustomPO @UserId,@POTypeId,@PONumber,@PRDetailsId,@Specification,@PRNo,@PORemarks,@IncoTermsId," +
                $"@PODId,@ProfInvoiceNo,@ProfInvoiceDate,@PaymentTermsId,@ShippingInstructionId,@SupplierId,@DeliveryDate,@Discount,@Amount," +
-               $"@UnitPrice,@Quantity,@DeliverTo,@CountryOrigin, @MessCode OUTPUT, @Message OUTPUT",
+               $"@UnitPrice,@Quantity,@DeliverTo,@CountryOrigin,@CurrencyId, @MessCode OUTPUT, @Message OUTPUT",
                new SqlParameter("@UserId", pODto.UserId),
                new SqlParameter("@POTypeId", pODto.POTypeId),
                new SqlParameter("@PONumber", formattedPONumber),
@@ -516,6 +524,7 @@ namespace CPRNIMS.Domain.Services.PO
                new SqlParameter("@Quantity", pODto.Quantity),
                new SqlParameter("@DeliverTo", pODto.DeliverTo),
                new SqlParameter("@CountryOrigin", pODto.CountryOrigin ?? "N/A"),
+               new SqlParameter("@CurrencyId", pODto.CurrencyId),
                 messCode,
                 message);
 
@@ -544,7 +553,7 @@ namespace CPRNIMS.Domain.Services.PO
             await _dbContext.Database
                .ExecuteSqlRawAsync("EXEC PutExistingPO @UserId,@POTypeId,@PONumber,@PRDetailsId,@Specification,@PRNo,@PORemarks,@IncoTermsId," +
                $"@PODId,@ProfInvoiceNo,@ProfInvoiceDate,@PaymentTermsId,@ShippingInstructionId,@SupplierId,@DeliveryDate,@Discount,@Amount," +
-               $"@UnitPrice,@Quantity,@DeliverTo,@IsRemoved,@CountryOrigin, @MessCode OUTPUT, @Message OUTPUT",
+               $"@UnitPrice,@Quantity,@DeliverTo,@IsRemoved,@CountryOrigin,@CurrencyId, @MessCode OUTPUT, @Message OUTPUT",
                new SqlParameter("@UserId", pODto.UserId),
                new SqlParameter("@POTypeId", pODto.POTypeId),
                new SqlParameter("@PONumber", pODto.PONo),
@@ -568,6 +577,7 @@ namespace CPRNIMS.Domain.Services.PO
                new SqlParameter("@DeliverTo", pODto.DeliverTo),
                new SqlParameter("@IsRemoved", isRemoved),
                new SqlParameter("@CountryOrigin", pODto.CountryOrigin ?? "N/A"),
+               new SqlParameter("@CurrencyId", pODto.CurrencyId),
                 messCode,
                 message);
 
@@ -635,7 +645,8 @@ namespace CPRNIMS.Domain.Services.PO
                 DeliverTo = PODto.DeliverTo ?? "N/A",
                 Specification = specification,
                 IsUpdate = PODto.IsUpdate,
-                CountryOrigin=PODto.CountryOrigin
+                CountryOrigin=PODto.CountryOrigin,
+                CurrencyId=PODto.CurrencyId
             };
         }
         public async Task<DocRequired> PostSuppDocRequirements(PODto poDto)
diff --git a/CPRNIMS.Domain/Services/PR/PRequest.cs b/CPRNIMS.Domain/Services/PR/PRequest.cs
index 1278e83..ade0f03 100644
--- a/CPRNIMS.Domain/Services/PR/PRequest.cs
+++ b/CPRNIMS.Domain/Services/PR/PRequest.cs
@@ -633,6 +633,17 @@ namespace CPRNIMS.Domain.Services.PR
                           && pr.IsActive
                           select pr).AnyAsync();
         }
+        private async Task<bool> ProjectStatusChanges(int projectCodeId,string? status)
+        {
+            var project = await _dbContext.ProjectCodes.FirstOrDefaultAsync(pc=>pc.ProjectCodeId==projectCodeId);
+            if (project == null)
+                return false;
+
+            if (project.StatusName == status) 
+                return false;
+            else 
+                return true;
+        }
         public async Task<MessageResponse> PRItemRemoval(PRDto prDto)
         {
             var (messCode, message) = CreateOutputParams();
@@ -653,7 +664,6 @@ namespace CPRNIMS.Domain.Services.PR
             };
             return response;
         }
-
         public async Task<ResponseObject> PostPutProjectCode(PRDto prDto)
         {
             if (prDto == null) throw new ArgumentNullException(nameof(prDto));
@@ -669,13 +679,14 @@ namespace CPRNIMS.Domain.Services.PR
                     ProjectName = prDto.ProjectName,
                     DeliveryAddress = prDto.DeliveryAddress,
                     MaxDays = prDto.MaxDays,
+                    StatusName = prDto.StatusName,
                     IsActive = prDto.IsActive
                 };
                 await _dbContext.ProjectCodes.AddAsync(project);
             }
             else
             {
-                if (await IsUsingAsync(prDto.ProjectCodeId))
+                if (await IsUsingAsync(prDto.ProjectCodeId) && await ProjectStatusChanges(prDto.ProjectCodeId,prDto.StatusName) == false)
                 {
                     return new ResponseObject()
                     {
@@ -684,12 +695,17 @@ namespace CPRNIMS.Domain.Services.PR
                         success = false,
                     };
                 }
+                if (await IsUsingAsync(prDto.ProjectCodeId))
+                {
+                    existing.StatusName = prDto.StatusName;
+                }
                 else
                 {
                     existing.ProjectCode = prDto.ProjectCode;
                     existing.ProjectName = prDto.ProjectName;
                     existing.DeliveryAddress = prDto.DeliveryAddress;
                     existing.MaxDays = prDto.MaxDays;
+                    existing.StatusName = prDto.StatusName;
                     existing.IsActive = prDto.IsActive;
                 }
             }
diff --git a/CPRNIMS.Domain/Services/Receiving/Receiving.cs b/CPRNIMS.Domain/Services/Receiving/Receiving.cs
index 37ed0c8..4302291 100644
--- a/CPRNIMS.Domain/Services/Receiving/Receiving.cs
+++ b/CPRNIMS.Domain/Services/Receiving/Receiving.cs
@@ -73,7 +73,7 @@ namespace CPRNIMS.Domain.Services.Receiving
 
             return allItems ?? new List<ReceivingDetail>();
         }
-        public async Task<List<RRDetail>> GetRRDetail(ItemDto itemDto)
+        public async Task<List<RRDetailDto>> GetRRDetail(ItemDto itemDto)
         {
             var allItems = await _dbContext.RRDetailss
                     .FromSqlRaw("EXEC GetRRDetail @RRNo,@UserId",
@@ -81,7 +81,7 @@ namespace CPRNIMS.Domain.Services.Receiving
                     new SqlParameter("@UserId", itemDto.UserId))
                     .ToListAsync();
 
-            return allItems ?? new List<RRDetail>();
+            return allItems ?? new List<RRDetailDto>();
         }
         #endregion
         #region Post Put
diff --git a/CPRNIMS.Domain/UIContracts/Inventory/IMRS.cs b/CPRNIMS.Domain/UIContracts/Inventory/IMRS.cs
index db894dd..c762070 100644
--- a/CPRNIMS.Domain/UIContracts/Inventory/IMRS.cs
+++ b/CPRNIMS.Domain/UIContracts/Inventory/IMRS.cs
@@ -16,5 +16,7 @@ namespace CPRNIMS.Domain.UIContracts.Inventory
         Task<ApiResponse<object>> CreateMRS(CreateMRSRequest request, CancellationToken ct);
         Task<ApiResponse<object>> ApproveMRS(ApproveMRSRequest request, CancellationToken ct);
         Task<ApiResponse<object>> CancelMRS(CancelMRSRequest request, CancellationToken ct);
+        Task<ApiResponse<List<SearchRISProjectCodeResponse>>> SearchRIS(SearchRISProjectCodeRequest request, CancellationToken ct);
+        Task<ApiResponse<List<ProjectCodeOptionResponse>>> SearchProjects(SearchRISProjectCodeRequest request, CancellationToken ct);
     }
 }
diff --git a/CPRNIMS.Domain/UIContracts/PO/IPurchaseOrder.cs b/CPRNIMS.Domain/UIContracts/PO/IPurchaseOrder.cs
index 254db89..9b904dd 100644
--- a/CPRNIMS.Domain/UIContracts/PO/IPurchaseOrder.cs
+++ b/CPRNIMS.Domain/UIContracts/PO/IPurchaseOrder.cs
@@ -11,6 +11,7 @@ namespace CPRNIMS.Domain.UIContracts.PO
     public interface IPurchaseOrder 
     {
         #region Get
+        Task<List<POVM>> GetCurrencies(User user, POVM viewModels);
         Task<List<POVM>> GetSupplierBidById(User user, POVM viewModel);
         Task<List<POVM>> GetSupplierBidByItem(User user, POVM viewModel);
         Task<List<POVM>> GetSupplierBid(User user, POVM viewModel);
diff --git a/CPRNIMS.Domain/UIServices/Inventory/MRS.cs b/CPRNIMS.Domain/UIServices/Inventory/MRS.cs
index 7ccc98d..bb3e148 100644
--- a/CPRNIMS.Domain/UIServices/Inventory/MRS.cs
+++ b/CPRNIMS.Domain/UIServices/Inventory/MRS.cs
@@ -1,4 +1,5 @@
-using CPRNIMS.Domain.Services;
+using Azure.Core;
+using CPRNIMS.Domain.Services;
 using CPRNIMS.Domain.UIContracts.Common;
 using CPRNIMS.Domain.UIContracts.Inventory;
 using CPRNIMS.Infrastructure.Dto.Common;
@@ -141,5 +142,56 @@ namespace CPRNIMS.Domain.UIServices.Inventory
 
             return result;
         }
+
+        public async Task<ApiResponse<List<SearchRISProjectCodeResponse>>> SearchRIS(SearchRISProjectCodeRequest request, CancellationToken ct)
+        {
+            var token = await _tokenHelper.GetValidTokenAsync();
+            if (string.IsNullOrEmpty(token))
+                throw new InvalidOperationException("Token has been expired.");
+
+            var baseEndpoint = _configuration["LLI:NonInvent:InventoryMgmt:SearchRIS"]
+                ?? throw new InvalidOperationException("GetMRS endpoint is not configured.");
+
+            var qs = new StringBuilder(baseEndpoint).Append('?');
+
+            if (!string.IsNullOrWhiteSpace(request.SearchRISNo))
+                qs.Append($"&searchRISNo={Uri.EscapeDataString(request.SearchRISNo)}");
+            if (!string.IsNullOrWhiteSpace(request.SearchRISNo))
+                qs.Append($"&projectCodeId= {request.SearchProjectCodeId}");
+
+            using var http = _apiConfigurationService.CreateHttpClientWithDefaultHeaders(token);
+            var response = await http.GetAsync(qs.ToString(), ct);
+            var json = await response.Content.ReadAsStringAsync(ct);
+
+            if (!response.IsSuccessStatusCode)
+                return new ApiResponse<List<SearchRISProjectCodeResponse>>{ };
+
+            var result = JsonSerializer.Deserialize<ApiResponse<List<SearchRISProjectCodeResponse>>>(json, _mrsJsonOpts);
+            return result ?? new ApiResponse<List<SearchRISProjectCodeResponse>>();
+        }
+
+        public async Task<ApiResponse<List<ProjectCodeOptionResponse>>> SearchProjects(SearchRISProjectCodeRequest request, CancellationToken ct)
+        {
+            var token = await _tokenHelper.GetValidTokenAsync();
+            if (string.IsNullOrEmpty(token))
+                throw new InvalidOperationException("Token has expired.");
+
+            var baseEndpoint = _configuration["LLI:NonInvent:InventoryMgmt:SearchProjects"]
+                ?? throw new InvalidOperationException("SearchProjects endpoint is not configured.");
+
+            var qs = new StringBuilder(baseEndpoint);
+            if (!string.IsNullOrWhiteSpace(request.SearchProjectCode))
+                qs.Append('?').Append("searchProjectCode=").Append(Uri.EscapeDataString(request.SearchProjectCode));
+
+            using var http = _apiConfigurationService.CreateHttpClientWithDefaultHeaders(token);
+            var response = await http.GetAsync(qs.ToString(), ct);
+            var json = await response.Content.ReadAsStringAsync(ct);
+
+            if (!response.IsSuccessStatusCode)
+                return new ApiResponse<List<ProjectCodeOptionResponse>>();
+
+            var result = JsonSerializer.Deserialize<ApiResponse<List<ProjectCodeOptionResponse>>>(json, _mrsJsonOpts);
+            return result ?? new ApiResponse<List<ProjectCodeOptionResponse>>();
+        }
     }
 }
diff --git a/CPRNIMS.Domain/UIServices/PO/PurchaseOrder.cs b/CPRNIMS.Domain/UIServices/PO/PurchaseOrder.cs
index 022d028..7d6a92b 100644
--- a/CPRNIMS.Domain/UIServices/PO/PurchaseOrder.cs
+++ b/CPRNIMS.Domain/UIServices/PO/PurchaseOrder.cs
@@ -284,6 +284,11 @@ namespace CPRNIMS.Domain.UIServices.PO
             return await SendGetApiRequest(user, viewModel,
            _configuration["LLI:NonInvent:POMgmt:GetPortOfDischarge"]);
         }
+        public async Task<List<POVM>> GetCurrencies(User user, POVM viewModel)
+        {
+            return await SendGetApiRequest(user, viewModel,
+            _configuration["LLI:NonInvent:POMgmt:GetCurrencies"]);
+        }
         #endregion
         #region Post Put
         public async Task<POVM> PostApprovedSupplier(User user, POVM viewModel)
diff --git a/CPRNIMS.Infrastructure/Database/NonInventoryDbContext.cs b/CPRNIMS.Infrastructure/Database/NonInventoryDbContext.cs
index 82e7b57..c2e06c4 100644
--- a/CPRNIMS.Infrastructure/Database/NonInventoryDbContext.cs
+++ b/CPRNIMS.Infrastructure/Database/NonInventoryDbContext.cs
@@ -40,6 +40,7 @@ namespace CPRNIMS.Infrastructure.Database
         public virtual DbSet<ItemCode> ItemCodes { get; set; }
         public virtual DbSet<ItemList> ItemList { get; set; }
         public virtual DbSet<Item> Items { get; set; }
+        public DbSet<ItemDtos> ItemDtos { get; set; }
         public DbSet<Attachment> Attachments { get; set; }
         public virtual DbSet<AttachmentExtension> AttachmentExtensions { get; set; }
         public virtual DbSet<AttachmentFileType> AttachmentFileTypes { get; set; }
@@ -127,6 +128,7 @@ namespace CPRNIMS.Infrastructure.Database
         public virtual DbSet<PaymentTerm> PaymentTerms { get; set; }
         public virtual DbSet<Incoterm> Incoterms { get; set; }
         public virtual DbSet<CentralPONo> CentralPONos { get; set; }
+        public DbSet<Currencies> Currencies { get; set; }
         #endregion
 
         #region Inventory
@@ -148,10 +150,11 @@ namespace CPRNIMS.Infrastructure.Database
         public virtual DbSet<ForReceiving> ForReceivings { get; set; }
         public virtual DbSet<Infrastructure.Entities.Receiving.RRReport> RRReports { get; set; }
         public virtual DbSet<ReceivingDetail> ReceivingDetails { get; set; }
-        public virtual DbSet<RRDetail> RRDetails { get; set; }
+        public virtual DbSet<RRDetailDto> RRDetailDtos { get; set; }
         public virtual DbSet<ForRR> ForRRs { get; set; }
         public virtual DbSet<RR> RRs { get; set; }
-        public virtual DbSet<Entities.Receiving.RRDetail> RRDetailss { get; set; }
+        public virtual DbSet<Entities.Receiving.RRDetailDto> RRDetailss { get; set; }
+        public virtual DbSet<Entities.Receiving.RRDetails> RRDetails { get; set; }
         public virtual DbSet<RRSeries> RRSeries { get; set; }
         #endregion
 
@@ -294,7 +297,15 @@ namespace CPRNIMS.Infrastructure.Database
                  .WithMany()
                  .HasForeignKey(t => t.PRDetailId)
                  .OnDelete(DeleteBehavior.Restrict);
+
+                e.HasOne(r => r.RRDetails)
+                 .WithMany()
+                 .HasForeignKey(r => r.RRDetailId)
+                 .IsRequired(false)
+                 .HasForeignKey(r => r.RRDetailId)
+                 .OnDelete(DeleteBehavior.Restrict);
             });
+
             modelBuilder.Entity<PRDetails>(e =>
             {
                 e.HasOne(i => i.PRs)
@@ -312,6 +323,10 @@ namespace CPRNIMS.Infrastructure.Database
                 e.HasOne(r => r.Discipline)
                  .WithMany()
                  .HasForeignKey(r => r.DisciplineId);
+
+                e.HasOne(r => r.ProjectCodes)
+                .WithMany()
+                .HasForeignKey(r => r.ProjectCodeId);
             });
 
             modelBuilder.Entity<MRS>(e => {
diff --git a/CPRNIMS.Infrastructure/Dto/Inventory/DisciplineDto.cs b/CPRNIMS.Infrastructure/Dto/Inventory/DisciplineDto.cs
index 442ba21..fc45cc1 100644
--- a/CPRNIMS.Infrastructure/Dto/Inventory/DisciplineDto.cs
+++ b/CPRNIMS.Infrastructure/Dto/Inventory/DisciplineDto.cs
@@ -11,4 +11,10 @@ namespace CPRNIMS.Infrastructure.Dto.Inventory
         public byte DisciplineId { get; set; }
         public string DisciplineName { get; set; } = string.Empty;
     }
+    public class ProjectCodeDto
+    {
+        public string ProjectCode { get; set; } = string.Empty;
+        public string ProjectName { get; set; } = string.Empty;
+        public int ProjectCodeId { get; set; }
+    }
 }
diff --git a/CPRNIMS.Infrastructure/Dto/Inventory/RISSearchResultDto.cs b/CPRNIMS.Infrastructure/Dto/Inventory/RISSearchResultDto.cs
new file mode 100644
index 0000000..cab1928
--- /dev/null
+++ b/CPRNIMS.Infrastructure/Dto/Inventory/RISSearchResultDto.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CPRNIMS.Infrastructure.Dto.Inventory
+{
+    public class RISSearchResultDto
+    {
+        public long RISId { get; set; }
+        public string RISNo { get; set; } = string.Empty;
+        public int ProjectCodeId { get; set; }
+        public string ProjectCode { get; set; } = string.Empty;
+        public string ProjectName { get; set; } = string.Empty;
+        public string DisciplineName { get; set; } = string.Empty;
+        public decimal QtyAvailableToReturn { get; set; }
+    }
+
+    public class ProjectCodeOptionDto
+    {
+        public int ProjectCodeId { get; set; }
+        public string ProjectCode { get; set; } = string.Empty;
+        public string ProjectName { get; set; } = string.Empty;
+    }
+}
diff --git a/CPRNIMS.Infrastructure/Dto/Inventory/Reports/ReportDtos.cs b/CPRNIMS.Infrastructure/Dto/Inventory/Reports/ReportDtos.cs
index 6b075ea..d756fac 100644
--- a/CPRNIMS.Infrastructure/Dto/Inventory/Reports/ReportDtos.cs
+++ b/CPRNIMS.Infrastructure/Dto/Inventory/Reports/ReportDtos.cs
@@ -39,7 +39,7 @@ namespace CPRNIMS.Infrastructure.Dto.Inventory.Reports
         public string ItemName { get; set; } = string.Empty;
         public long ItemNo { get; set; }
         public string DisciplineName { get; set; } = string.Empty;
-        public string IssuedTo { get; set; } = string.Empty;
+        public string ProjectName { get; set; } = string.Empty;
         public decimal QtyIssued { get; set; }
         public decimal TotalReturned { get; set; }
         public decimal NetIssued { get; set; }
@@ -121,6 +121,7 @@ namespace CPRNIMS.Infrastructure.Dto.Inventory.Reports
         public decimal TotalOnHand { get; set; }
         public decimal TotalQtyIn { get; set; }
         public decimal TotalQtyOut { get; set; }
+        public decimal TotalValue {  get; set; }
         public int LowStockCount { get; set; }
         public int OutOfStockCount { get; set; }
     }
@@ -134,6 +135,7 @@ namespace CPRNIMS.Infrastructure.Dto.Inventory.Reports
         public decimal QtyIn { get; set; }
         public decimal QtyOut { get; set; }
         public decimal QtyOnHand { get; set; }
+        public decimal UnitPrice { get; set; }
         public int StockPct { get; set; }
     }
 
diff --git a/CPRNIMS.Infrastructure/Dto/Inventory/Request/CreateRISRequest.cs b/CPRNIMS.Infrastructure/Dto/Inventory/Request/CreateRISRequest.cs
index 6f56b43..49173ee 100644
--- a/CPRNIMS.Infrastructure/Dto/Inventory/Request/CreateRISRequest.cs
+++ b/CPRNIMS.Infrastructure/Dto/Inventory/Request/CreateRISRequest.cs
@@ -10,7 +10,7 @@ namespace CPRNIMS.Infrastructure.Dto.Inventory.Request
     {
         public int InventoryId { get; set; }
         public long PRDetailId { get; set; }
-        public string IssuedTo { get; set; } = string.Empty;
+        public int ProjectCodeId { get; set; }
         public byte DisciplineId { get; set; }
         public decimal QtyIssued { get; set; }
         public string? Remarks { get; set; }
diff --git a/CPRNIMS.Infrastructure/Dto/Inventory/Request/SearchRISProjectCodeRequest.cs b/CPRNIMS.Infrastructure/Dto/Inventory/Request/SearchRISProjectCodeRequest.cs
new file mode 100644
index 0000000..a45108b
--- /dev/null
+++ b/CPRNIMS.Infrastructure/Dto/Inventory/Request/SearchRISProjectCodeRequest.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CPRNIMS.Infrastructure.Dto.Inventory.Request
+{
+    public class SearchRISProjectCodeRequest
+    {
+        public int? SearchProjectCodeId { get; set; }
+        public string? SearchRISNo { get; set; }
+        public string? SearchProjectCode { get; set; }
+    }
+}
diff --git a/CPRNIMS.Infrastructure/Dto/Inventory/Response/RISPagedResponse.cs b/CPRNIMS.Infrastructure/Dto/Inventory/Response/RISPagedResponse.cs
index 410715d..a12ff2a 100644
--- a/CPRNIMS.Infrastructure/Dto/Inventory/Response/RISPagedResponse.cs
+++ b/CPRNIMS.Infrastructure/Dto/Inventory/Response/RISPagedResponse.cs
@@ -27,7 +27,9 @@ namespace CPRNIMS.Infrastructure.Dto.Inventory.Response
 
         public long ItemNo { get; set; }
 
-        public string? IssuedTo { get; set; }
+        public string? ProjectCode { get; set; }
+
+        public string? ProjectName { get; set; }
 
         public string? DisciplineName { get; set; }
 
diff --git a/CPRNIMS.Infrastructure/Dto/Inventory/Response/RISProjectCodeResponse.cs b/CPRNIMS.Infrastructure/Dto/Inventory/Response/RISProjectCodeResponse.cs
new file mode 100644
index 0000000..78e64da
--- /dev/null
+++ b/CPRNIMS.Infrastructure/Dto/Inventory/Response/RISProjectCodeResponse.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CPRNIMS.Infrastructure.Dto.Inventory.Response
+{
+    public class RISProjectCodeResponse
+    {
+        public string ProjectCode { get; set; }=string.Empty;
+        public string ProjectName { get; set; } = string.Empty;
+
+    }
+}
diff --git a/CPRNIMS.Infrastructure/Dto/Inventory/Response/RISResponse.cs b/CPRNIMS.Infrastructure/Dto/Inventory/Response/RISResponse.cs
index d2fd405..f70fc35 100644
--- a/CPRNIMS.Infrastructure/Dto/Inventory/Response/RISResponse.cs
+++ b/CPRNIMS.Infrastructure/Dto/Inventory/Response/RISResponse.cs
@@ -14,7 +14,7 @@ namespace CPRNIMS.Infrastructure.Dto.Inventory.Response
         public string ItemName { get; set; } = string.Empty;
         public long ItemNo { get; set; }
         public string? LotNo { get; set; }
-        public string IssuedTo { get; set; } = string.Empty;
+        public int ProjectCodeId { get; set; } 
         public string DisciplineName { get; set; } = string.Empty;
         public string? Message { get; set; }
         public byte DisciplineId { get; set; }
@@ -28,5 +28,7 @@ namespace CPRNIMS.Infrastructure.Dto.Inventory.Response
         public DateTime? ApprovedDate { get; set; }
         public decimal MRSCount { get; set; }
         public decimal TotalReturned { get; set; }
+        public string? ProjectName { get; set; }
+        public string? ProjectCode { get; set; }
     }
 }
diff --git a/CPRNIMS.Infrastructure/Dto/Inventory/Response/SearchRISProjectCodeResponse.cs b/CPRNIMS.Infrastructure/Dto/Inventory/Response/SearchRISProjectCodeResponse.cs
new file mode 100644
index 0000000..7c9c185
--- /dev/null
+++ b/CPRNIMS.Infrastructure/Dto/Inventory/Response/SearchRISProjectCodeResponse.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CPRNIMS.Infrastructure.Dto.Inventory.Response
+{
+    public class SearchApiResponse<T>
+    {
+        public bool Success { get; set; }
+        public List<T> data { get; set; } = new List<T>();
+    }
+    public class SearchRISProjectCodeResponse
+    {
+        public long RISId { get; set; }
+        public string RISNo { get; set; } = string.Empty;
+        public int ProjectCodeId { get; set; }
+        public string ProjectCode { get; set; } = string.Empty;
+        public string ProjectName { get; set; } = string.Empty;
+        public string DisciplineName { get; set; } = string.Empty;
+        public decimal QtyAvailableToReturn { get; set; }
+    }
+    public class ProjectCodeOptionResponse
+    {
+        public int ProjectCodeId { get; set; }
+        public string ProjectCode { get; set; } = string.Empty;
+        public string ProjectName { get; set; } = string.Empty;
+    }
+}
diff --git a/CPRNIMS.Infrastructure/Dto/Inventory/TransactContextDto.cs b/CPRNIMS.Infrastructure/Dto/Inventory/TransactContextDto.cs
index f2d0f95..406cca6 100644
--- a/CPRNIMS.Infrastructure/Dto/Inventory/TransactContextDto.cs
+++ b/CPRNIMS.Infrastructure/Dto/Inventory/TransactContextDto.cs
@@ -17,6 +17,7 @@ namespace CPRNIMS.Infrastructure.Dto.Inventory
         public decimal QtyOnHand { get; set; }
         public decimal QtyIn { get; set; }
         public decimal QtyOut { get; set; }
+        public IEnumerable<ProjectCodeDto> ProjectCodes { get; set; } = [];
         public IEnumerable<DisciplineDto> Disciplines { get; set; } = [];
         public IEnumerable<RISReferenceDto> OpenRISList { get; set; } = [];
     }
diff --git a/CPRNIMS.Infrastructure/Dto/PO/PODto.cs b/CPRNIMS.Infrastructure/Dto/PO/PODto.cs
index 812f2ad..5119a95 100644
--- a/CPRNIMS.Infrastructure/Dto/PO/PODto.cs
+++ b/CPRNIMS.Infrastructure/Dto/PO/PODto.cs
@@ -23,7 +23,7 @@ namespace CPRNIMS.Infrastructure.Dto.PO
         public string? SupplierName { get; set; }
         public string? Manufacturer { get; set; }
         public int ItemCount { get; set; }
-        public short CurrencyId { get; set; }
+        public byte CurrencyId { get; set; }
         public string? Department { get; set; }
         public string? ItemCategoryName { get; set; }
         public DateTime CommitmentDate { get; set; }
diff --git a/CPRNIMS.Infrastructure/Entities/Account/ApplicationUser.cs b/CPRNIMS.Infrastructure/Entities/Account/ApplicationUser.cs
index 2787f66..bb4b0c7 100644
--- a/CPRNIMS.Infrastructure/Entities/Account/ApplicationUser.cs
+++ b/CPRNIMS.Infrastructure/Entities/Account/ApplicationUser.cs
@@ -23,6 +23,7 @@ namespace CPRNIMS.Infrastructure.Entities.Account
         public DateTime UpdatedDate { get; set; }
         public string? ProfilePicture { get; set; }
         public string? Address { get; set; }
+        public bool? IsActive { get; set; }
         public Attachment? Attachment { get; set; }
     }
 }
diff --git a/CPRNIMS.Infrastructure/Entities/Finance/RRDetail.cs b/CPRNIMS.Infrastructure/Entities/Finance/RRDetailDto.cs
similarity index 96%
rename from CPRNIMS.Infrastructure/Entities/Finance/RRDetail.cs
rename to CPRNIMS.Infrastructure/Entities/Finance/RRDetailDto.cs
index 07f67a5..73cb990 100644
--- a/CPRNIMS.Infrastructure/Entities/Finance/RRDetail.cs
+++ b/CPRNIMS.Infrastructure/Entities/Finance/RRDetailDto.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace CPRNIMS.Infrastructure.Entities.Finance
 {
-    public class RRDetail : CommonProperties
+    public class RRDetailDto : CommonProperties
     {
         [Key]
         public long RRDetailId { get; set; }
diff --git a/CPRNIMS.Infrastructure/Entities/Inventory/InventTrans.cs b/CPRNIMS.Infrastructure/Entities/Inventory/InventTrans.cs
index 542d8bf..a129954 100644
--- a/CPRNIMS.Infrastructure/Entities/Inventory/InventTrans.cs
+++ b/CPRNIMS.Infrastructure/Entities/Inventory/InventTrans.cs
@@ -18,7 +18,6 @@ namespace CPRNIMS.Infrastructure.Entities.Inventory
         public string CreatedBy { get; set; }=string.Empty;
         public bool IsActive { get; set; }
         public Inventory? Inventory { get; set; }
-       // public InventTransDetail? InventTransDetail { get; set; }
         public ICollection<InventTransDetail> InventTransDetails { get; set; } = [];
     }
 }
diff --git a/CPRNIMS.Infrastructure/Entities/Inventory/InventTransDetail.cs b/CPRNIMS.Infrastructure/Entities/Inventory/InventTransDetail.cs
index 16e8762..db12408 100644
--- a/CPRNIMS.Infrastructure/Entities/Inventory/InventTransDetail.cs
+++ b/CPRNIMS.Infrastructure/Entities/Inventory/InventTransDetail.cs
@@ -1,5 +1,6 @@
 using CPRNIMS.Infrastructure.Entities.Items;
 using CPRNIMS.Infrastructure.Entities.Purchasing;
+using CPRNIMS.Infrastructure.Entities.Receiving;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -17,15 +18,15 @@ namespace CPRNIMS.Infrastructure.Entities.Inventory
         public long InventTransDetailId { get; set; }
         public int InventTransId { get; set; }
         public byte TransTypeId { get; set; }
-        public long RRDetailId { get; set; }
         public decimal QtyIn {  get; set; }
         public decimal QtyOut { get; set; }
         public DateTime CreatedDate { get; set; }
         public string? Remarks { get; set; }
         public bool IsActive { get; set; }
         public long PRDetailId { get; set; }
+        public long? RRDetailId { get; set; }
         public PRDetails? PRDetails { get; set; }
-        public ItemCategory? ItemCategory { get; set; }
+        public RRDetails? RRDetails { get; set; }
         public InventTrans? InventTrans { get; set; }
     }
 }
diff --git a/CPRNIMS.Infrastructure/Entities/Inventory/RIS.cs b/CPRNIMS.Infrastructure/Entities/Inventory/RIS.cs
index 3f95684..85809fa 100644
--- a/CPRNIMS.Infrastructure/Entities/Inventory/RIS.cs
+++ b/CPRNIMS.Infrastructure/Entities/Inventory/RIS.cs
@@ -20,10 +20,6 @@ namespace CPRNIMS.Infrastructure.Entities.Inventory
 
         public int InventoryId { get; set; }
         public long PRDetailId { get; set; }
-
-        [Required, MaxLength(450)]
-        public string IssuedTo { get; set; } = string.Empty;
-
         public byte DisciplineId { get; set; }
         public decimal QtyIssued { get; set; }
 
@@ -40,6 +36,8 @@ namespace CPRNIMS.Infrastructure.Entities.Inventory
         public string? CanceledBy { get; set; }
         public DateTime?  CanceledDate { get; set; }
         public string? Reason { get; set; }
+        public int ProjectCodeId { get; set; }
+        public ProjectCodes ProjectCodes { get; set; } = null!;
         public Inventory Inventory { get; set; } = null!;
         public PRDetails PRDetail { get; set; } = null!;
         public Discipline Discipline { get; set; } = null!;
diff --git a/CPRNIMS.Infrastructure/Entities/Items/ItemDtos.cs b/CPRNIMS.Infrastructure/Entities/Items/ItemDtos.cs
new file mode 100644
index 0000000..ccba894
--- /dev/null
+++ b/CPRNIMS.Infrastructure/Entities/Items/ItemDtos.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CPRNIMS.Infrastructure.Entities.Items
+{
+    public class ItemDtos
+    {
+        [Key]
+        public long ItemNo { get; set; }
+        public long ItemCodeId { get; set; }
+        public string? Department { get; set; }
+        public string? ItemCategoryName { get; set; }
+        public string? UserId { get; set; }
+        public string? ItemName { get; set; }
+        public string? ItemDescription { get; set; }
+        public string? StatusName { get; set; }
+        public bool IsActive { get; set; }
+        public bool IsCommon { get; set; }
+        public byte RequestTypeId { get; set; }
+        public string? ItemLocalName { get; set; }
+        public string? ItemTypeName { get; set; }
+        public string? PRTypeName { get; set; }
+        public decimal Qty { get; set; }
+        public int ItemColorId { get; set; }
+        public short ItemLocalId { get; set; }
+        public int UOMId { get; set; }
+        public short ItemCategoryId { get; set; }
+        public string? PackagingTypeName { get; set; }
+        public short ItemClassId { get; set; }
+        public string? UOMName { get; set; }
+        public string? ItemColorName { get; set; }
+        public long ItemAttachId { get; set; }
+        public string? ItemAttachPath { get; set; }
+        public bool IsMDLD { get; set; }
+        public bool CheckBox { get; set; }
+    }
+}
diff --git a/CPRNIMS.Infrastructure/Entities/PO/Currencies.cs b/CPRNIMS.Infrastructure/Entities/PO/Currencies.cs
new file mode 100644
index 0000000..cc92620
--- /dev/null
+++ b/CPRNIMS.Infrastructure/Entities/PO/Currencies.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CPRNIMS.Infrastructure.Entities.PO
+{
+    [Table("Currencies")]
+    public class Currencies
+    {
+        [Key]
+        public byte CurrencyId { get; set; }
+        public string CurrencyName { get; set; }=string.Empty;
+        public decimal VatRate { get; set; }
+        public decimal CER { get; set; }
+        public string? AmountWords { get; set; }
+        public bool? IsActive { get; set; }
+    }
+}
diff --git a/CPRNIMS.Infrastructure/Entities/PO/POHeader.cs b/CPRNIMS.Infrastructure/Entities/PO/POHeader.cs
index 3d1be6c..100c1cf 100644
--- a/CPRNIMS.Infrastructure/Entities/PO/POHeader.cs
+++ b/CPRNIMS.Infrastructure/Entities/PO/POHeader.cs
@@ -34,6 +34,7 @@ namespace CPRNIMS.Infrastructure.Entities.PO
         public byte PODId { get; set; }
         public byte POTypeId { get; set; }
         public byte IncoTermsId { get; set; }
+        public byte CurrencyId { get; set; }
         public string? IncotermsName { get; set; }
         public string? CountryOrigin { get; set; }
     }
diff --git a/CPRNIMS.Infrastructure/Entities/Purchasing/ProjectCodes.cs b/CPRNIMS.Infrastructure/Entities/Purchasing/ProjectCodes.cs
index 7f90ed0..7726e43 100644
--- a/CPRNIMS.Infrastructure/Entities/Purchasing/ProjectCodes.cs
+++ b/CPRNIMS.Infrastructure/Entities/Purchasing/ProjectCodes.cs
@@ -17,6 +17,7 @@ namespace CPRNIMS.Infrastructure.Entities.Purchasing
         public string? ProjectName { get; set; }
         public int MaxDays { get; set; }
         public string? DeliveryAddress { get; set; } 
+        public string? StatusName { get; set; }
         public bool IsActive { get; set; }
     }
 }
diff --git a/CPRNIMS.Infrastructure/Entities/Receiving/RRDetail.cs b/CPRNIMS.Infrastructure/Entities/Receiving/RRDetailDto.cs
similarity index 98%
rename from CPRNIMS.Infrastructure/Entities/Receiving/RRDetail.cs
rename to CPRNIMS.Infrastructure/Entities/Receiving/RRDetailDto.cs
index ace4bac..f81c4fd 100644
--- a/CPRNIMS.Infrastructure/Entities/Receiving/RRDetail.cs
+++ b/CPRNIMS.Infrastructure/Entities/Receiving/RRDetailDto.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace CPRNIMS.Infrastructure.Entities.Receiving
 {
-    public class RRDetail
+    public class RRDetailDto
     {
         [Key]
         public long PRDetailsId { get; set; }
diff --git a/CPRNIMS.Infrastructure/Entities/Receiving/RRDetails.cs b/CPRNIMS.Infrastructure/Entities/Receiving/RRDetails.cs
new file mode 100644
index 0000000..5546022
--- /dev/null
+++ b/CPRNIMS.Infrastructure/Entities/Receiving/RRDetails.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CPRNIMS.Infrastructure.Entities.Receiving
+{
+    [Table("RRDetails")]
+    public class RRDetails
+    {
+        [Key]
+        public long RRDetailId { get; set; }
+        public long PRDetailId { get; set; }
+        public long RRId { get; set; }
+        public long PODetailId { get; set; }
+        public decimal Quantity { get; set; }
+        public decimal QuantityReceived { get; set; } 
+        public decimal QtyRemaining { get; set; }
+        public decimal UnitPrice { get; set; }
+        public bool IsActive { get; set; }
+    }
+}
diff --git a/CPRNIMS.Infrastructure/Models/Account/User.cs b/CPRNIMS.Infrastructure/Models/Account/User.cs
index 2a96675..1ff6281 100644
--- a/CPRNIMS.Infrastructure/Models/Account/User.cs
+++ b/CPRNIMS.Infrastructure/Models/Account/User.cs
@@ -23,5 +23,6 @@ namespace CPRNIMS.Infrastructure.Models.Account
         public string? Token { get; set; }
         public string? Company { get; set; }
         public string? MyAccess { get; set; }
+        public int DepartmentId { get; set; }
     }
 }
diff --git a/CPRNIMS.Infrastructure/ViewModel/PO/POVM.cs b/CPRNIMS.Infrastructure/ViewModel/PO/POVM.cs
index 5489a00..45cb431 100644
--- a/CPRNIMS.Infrastructure/ViewModel/PO/POVM.cs
+++ b/CPRNIMS.Infrastructure/ViewModel/PO/POVM.cs
@@ -24,7 +24,7 @@ namespace CPRNIMS.Infrastructure.ViewModel.PO
         public string? ContactPerson { get; set; }
         public string? Manufacturer { get; set; }
         public int ItemCount { get; set; }
-        public short CurrencyId { get; set; }
+        public byte CurrencyId { get; set; }
         public string? Department { get; set; }
         public string? ItemCategoryName { get; set; }
         public DateTime CommitmentDate { get; set; }
diff --git a/CPRNIMS.WebApi/CPRNIMS.WebApi.csproj b/CPRNIMS.WebApi/CPRNIMS.WebApi.csproj
index d14d03a..e381846 100644
--- a/CPRNIMS.WebApi/CPRNIMS.WebApi.csproj
+++ b/CPRNIMS.WebApi/CPRNIMS.WebApi.csproj
@@ -29,9 +29,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FastReport.OpenSource" Version="2026.2.3" />
-    <PackageReference Include="FastReport.OpenSource.Export.PdfSimple" Version="2026.2.3" />
-    <PackageReference Include="FastReport.OpenSource.Web" Version="2026.2.3" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
   </ItemGroup>
diff --git a/CPRNIMS.WebApi/Controllers/Inventory/MRSMgmtController.cs b/CPRNIMS.WebApi/Controllers/Inventory/MRSMgmtController.cs
index 8f907f7..e452332 100644
--- a/CPRNIMS.WebApi/Controllers/Inventory/MRSMgmtController.cs
+++ b/CPRNIMS.WebApi/Controllers/Inventory/MRSMgmtController.cs
@@ -23,7 +23,20 @@ namespace CPRNIMS.WebApi.Controllers.Inventory
             var result = await _mrs.GetPagedAsync(filter, ct, currentUser.DepartmentId, currentUser.UserName);
             return Ok(result);
         }
-        [HttpPost()]
+        [HttpGet("SearchRIS")]
+        public async Task<IActionResult> SearchRIS([FromQuery] string? searchRISNo, int? projectCodeId, CancellationToken ct)
+        {
+            var results = await _mrs.SearchRISForReturnAsync(searchRISNo, projectCodeId, ct);
+            return Ok(new { success = true, data = results });
+        }
+
+        [HttpGet("SearchProjects")]
+        public async Task<IActionResult> SearchProjects([FromQuery] string? searchProjectCode, CancellationToken ct)
+        {
+            var results = await _mrs.GetProjectsWithOpenRISAsync(searchProjectCode, ct);
+            return Ok(new { success = true, data = results });
+        }
+        [HttpPost]
         public async Task<IActionResult> CreateMRS([FromBody] CreateMRSRequest request, CancellationToken ct)
         {
             var currentUser = User.ToUserClaims();
diff --git a/CPRNIMS.WebApi/Controllers/PO/POMgmtController.cs b/CPRNIMS.WebApi/Controllers/PO/POMgmtController.cs
index 01b329c..ee15b00 100644
--- a/CPRNIMS.WebApi/Controllers/PO/POMgmtController.cs
+++ b/CPRNIMS.WebApi/Controllers/PO/POMgmtController.cs
@@ -284,6 +284,12 @@ namespace CPRNIMS.WebApi.Controllers.PO
         }
         #endregion
         #region Get
+        [HttpPost("GetCurrencies")]
+        public async Task<IActionResult> GetCurrencies(Currencies request, CancellationToken ct)
+        {
+            var data = await _purchaseOrder.GetCurrencies(request.CurrencyName,ct);
+            return Ok(data);
+        }
         [HttpGet("GetPOFormData")]
         public async Task<IActionResult> GetPOFormData(int? poId = null)
         {
diff --git a/CPRNIMS.WebApi/Program.cs b/CPRNIMS.WebApi/Program.cs
index 152a480..66e6090 100644
--- a/CPRNIMS.WebApi/Program.cs
+++ b/CPRNIMS.WebApi/Program.cs
@@ -17,14 +17,14 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI(c =>
     {
-        c.SwaggerEndpoint("./v2/swagger.json", "LLOYD API V2"); //originally "./swagger/v1/swagger.json"
+        c.SwaggerEndpoint("./v2/swagger.json", "LLOYD API V2");
     });
 }
 app.UseMiddleware<GlobalExceptionMiddleware>();
 app.UseSwagger();
 app.UseSwaggerUI(c =>
 {
-    c.SwaggerEndpoint("./v2/swagger.json", "LLOYD API V2"); //originally "./swagger/v1/swagger.json"
+    c.SwaggerEndpoint("./v2/swagger.json", "LLOYD API V2"); 
 });
 
 app.UseCors("AllowAnyOrigin");
diff --git a/CPRNIMS.WebApi/Sql/Phase 5/Table.sql b/CPRNIMS.WebApi/Sql/Phase 5/Table.sql
index afa20a8..a7c898e 100644
--- a/CPRNIMS.WebApi/Sql/Phase 5/Table.sql	
+++ b/CPRNIMS.WebApi/Sql/Phase 5/Table.sql	
@@ -16,7 +16,7 @@ CREATE TABLE [dbo].[RIS] (
     [RISNo]         VARCHAR(50)  NOT NULL,          -- generated slip number
     [InventoryId]   INT          NOT NULL,
     [PRDetailId]    BIGINT       NOT NULL,
-    [IssuedTo]      VARCHAR(450) NOT NULL,           -- UserId receiving items
+    [ProjectCodeId] INT NOT NULL,           -- UserId receiving items
     [DisciplineId]  TINYINT      NOT NULL,           -- Trade/Matrix/Structural/Architectural
     [QtyIssued]     DECIMAL(14,2)           NOT NULL,
     [Remarks]       VARCHAR(500) NULL,
@@ -30,7 +30,8 @@ CREATE TABLE [dbo].[RIS] (
     Reason          VARCHAR(150) NULL,
     FOREIGN KEY ([InventoryId])  REFERENCES [Inventory]([InventoryId]),
     FOREIGN KEY ([PRDetailId])   REFERENCES [PRDetails]([PRDetailsId]),
-    FOREIGN KEY ([DisciplineId]) REFERENCES [Disciplines]([DisciplineId])
+    FOREIGN KEY ([DisciplineId]) REFERENCES [Disciplines]([DisciplineId]),
+    FOREIGN KEY ([ProjectCodeId]) REFERENCES ProjectCodes([ProjectCodeId])
 );
 
 -- ── MRS: Material Return Slip ─────────────────────────────────────
diff --git a/CPRNIMS.WebApps/Controllers/Base/BaseMethod.cs b/CPRNIMS.WebApps/Controllers/Base/BaseMethod.cs
index 6d8eef9..e3b3b4a 100644
--- a/CPRNIMS.WebApps/Controllers/Base/BaseMethod.cs
+++ b/CPRNIMS.WebApps/Controllers/Base/BaseMethod.cs
@@ -43,6 +43,7 @@ namespace CPRNIMS.WebApps.Controllers.Base
                 UserName = User.Identity?.Name,
                 FullName = User.FindFirst("FullName")?.Value,
                 Company = User.FindFirst("Company")?.Value,
+                DepartmentId = Convert.ToInt32(User.FindFirst("DepartmentId")?.Value),
                 MyAccess = UserRoles,
                 URLAttachment = User.FindFirst("URLAttachment")?.Value
             };
diff --git a/CPRNIMS.WebApps/Controllers/Inventory/InventoryMgmtController.cs b/CPRNIMS.WebApps/Controllers/Inventory/InventoryMgmtController.cs
index b65d8ab..b9b59f5 100644
--- a/CPRNIMS.WebApps/Controllers/Inventory/InventoryMgmtController.cs
+++ b/CPRNIMS.WebApps/Controllers/Inventory/InventoryMgmtController.cs
@@ -5,6 +5,7 @@ using CPRNIMS.Infrastructure.Helper;
 using CPRNIMS.Infrastructure.ViewModel.Inventory;
 using CPRNIMS.WebApps.Controllers.Base;
 using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
 
 
 namespace CPRNIMS.WebApps.Controllers.Inventory
@@ -133,7 +134,10 @@ namespace CPRNIMS.WebApps.Controllers.Inventory
         #region Views
         public IActionResult GetInventoryTabPage(int id)
         {
-            return ViewComponent("InventoryTabPage", new { inventoryTabPageId = id });
+            var currentDepartment = GetUser();
+            bool isFinance = currentDepartment.DepartmentId is 6 or 9;
+
+            return ViewComponent("InventoryTabPage", new { inventoryTabPageId = id, isFinance });
         }
         public async Task<IActionResult> Inventory()
         {
diff --git a/CPRNIMS.WebApps/Controllers/Inventory/MRSMgmtController.cs b/CPRNIMS.WebApps/Controllers/Inventory/MRSMgmtController.cs
index 2eaa661..eadcdc5 100644
--- a/CPRNIMS.WebApps/Controllers/Inventory/MRSMgmtController.cs
+++ b/CPRNIMS.WebApps/Controllers/Inventory/MRSMgmtController.cs
@@ -40,7 +40,25 @@ namespace CPRNIMS.WebApps.Controllers.Inventory
 
             return Json(new { data = result.Data, recordsTotal = result.RecordsTotal});
         }
+        [HttpGet]
+        public async Task<IActionResult> SearchRIS([FromQuery] int? searchProjectCodeId, string? searchRISNo , CancellationToken ct = default)
+        {
+            var result = await _mrs.SearchRIS(new SearchRISProjectCodeRequest
+            {
+                SearchRISNo = searchRISNo,
+                SearchProjectCodeId = searchProjectCodeId,
+            }, ct);
 
+            return Json(new { data = result.data, success = result.success, message = result.message });
+        }
+        [HttpGet]
+        public async Task<IActionResult> SearchProjects([FromQuery] string? searchProjectCode, CancellationToken ct = default)
+        {
+            var result = await _mrs.SearchProjects(new SearchRISProjectCodeRequest
+            { SearchProjectCode = searchProjectCode,}, ct);
+
+            return Json(new { data = result.data, success = result.success, message = result.message });
+        }
         [HttpPost]
         public async Task<IActionResult> CreateMRS([FromBody] CreateMRSRequest request,CancellationToken ct)
         {
diff --git a/CPRNIMS.WebApps/Controllers/PO/POMgmtController.cs b/CPRNIMS.WebApps/Controllers/PO/POMgmtController.cs
index 71803ed..1e039e6 100644
--- a/CPRNIMS.WebApps/Controllers/PO/POMgmtController.cs
+++ b/CPRNIMS.WebApps/Controllers/PO/POMgmtController.cs
@@ -418,6 +418,26 @@ namespace CPRNIMS.WebApps.Controllers.PO
             response = await _purchaseOrder.GetOtherCharges(GetUser(), viewModels);
             return GetResponse(response);
         }
+        [HttpGet]
+        public async Task<IActionResult> GetCurrencies([FromQuery] string query)
+        {
+            var viewModels = new POVM();
+            viewModels.CurrencyName = query;
+            var responseQuery = await _purchaseOrder.GetCurrencies(GetUser(), viewModels);
+
+            if (responseQuery == null)
+            {
+                responseQuery = new List<POVM>();
+            }
+            var formattedData = responseQuery.Select(item => new
+            {
+                label = item.CurrencyName,
+                value = item.CurrencyId,
+                value2 = item.Currency
+            });
+
+            return Json(new { success = true, data = formattedData });
+        }
         public async Task<IActionResult> GetSuppliers(string query)
         {
             var viewModels = new POVM();
@@ -435,6 +455,7 @@ namespace CPRNIMS.WebApps.Controllers.PO
                 value2 = item.Currency,
                 value3 = item.PaymentTerms,
                 value4 = item.PaymentTermsId,
+                value5 = item.CurrencyId
             });
 
             return Json(new { success = true, data = formattedData });
diff --git a/CPRNIMS.WebApps/Program.cs b/CPRNIMS.WebApps/Program.cs
index 0161dcc..a394bfa 100644
--- a/CPRNIMS.WebApps/Program.cs
+++ b/CPRNIMS.WebApps/Program.cs
@@ -17,10 +17,6 @@ if (!app.Environment.IsDevelopment())
     app.UseHsts();
 }
 
-//var provider = new FileExtensionContentTypeProvider();
-//provider.Mappings[".js"] = "text/javascript";
-//provider.Mappings[".css"] = "text/css";
-
 app.UseHttpsRedirection();
 app.UseStaticFiles();
 app.UseRouting();
diff --git a/CPRNIMS.WebApps/ViewComponents/Inventory/InventoryTabPageViewComponent.cs b/CPRNIMS.WebApps/ViewComponents/Inventory/InventoryTabPageViewComponent.cs
index 8f5dc3a..61bce53 100644
--- a/CPRNIMS.WebApps/ViewComponents/Inventory/InventoryTabPageViewComponent.cs
+++ b/CPRNIMS.WebApps/ViewComponents/Inventory/InventoryTabPageViewComponent.cs
@@ -4,14 +4,17 @@ namespace CPRNIMS.WebApps.ViewComponents.Inventory
 {
     public class InventoryTabPageViewComponent : ViewComponent
     {
-        public IViewComponentResult Invoke(int InventoryTabPageId)
+        public IViewComponentResult Invoke(int InventoryTabPageId,bool isFinance)
         {
+            var report = isFinance ? "~/Views/Components/Inventory/TabPage/Reports/InventorySummaryReportFinance.cshtml" 
+                : "~/Views/Components/Inventory/TabPage/Reports/InventorySummaryReport.cshtml";
+
             string viewName = InventoryTabPageId switch
             {
                 1 => "~/Views/Components/Inventory/TabPage/Inventory.cshtml",
                 2 => "~/Views/Components/Inventory/TabPage/RIS.cshtml",
                 3 => "~/Views/Components/Inventory/TabPage/MRS.cshtml",
-                4 => "~/Views/Components/Inventory/TabPage/Reports/InventorySummaryReport.cshtml",
+                4 => report,
                 5 => "~/Views/Components/Inventory/TabPage/Reports/RISReport.cshtml",
                 _ => "~/Views/Components/Inventory/TabPage/Reports/MRSReport.cshtml"
             };
diff --git a/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/InventoryTransaction.cshtml b/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/InventoryTransaction.cshtml
index 4c90651..b29e632 100644
--- a/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/InventoryTransaction.cshtml
+++ b/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/InventoryTransaction.cshtml
@@ -1,8 +1,3 @@
-@* ── Tab: Return Issuance Slip — For Approval ───────────────────────────────
-   Returned by GetInventoryTabPage?id=2 (or whichever tab id you assign)
-   Depends on: _InventoryStyles, _InventoryHelpers, window.InventoryHelpers
-────────────────────────────────────────────────────────────────────────────── *@
-
 @* ── FILTER BAR ── *@
 <div class="inv-filters">
     <div class="inv-search-box">
diff --git a/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/MRS.cshtml b/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/MRS.cshtml
index c0c55a9..526335f 100644
--- a/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/MRS.cshtml
+++ b/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/MRS.cshtml
@@ -126,39 +126,40 @@
         <!-- BODY -->
         <div style="padding:16px 18px;display:flex;flex-direction:column;gap:14px">
 
+            <!-- Project code/name search -->
+            <div class="tm-form-group" style="position:relative">
+                <label class="tm-label">
+                    <i class="fas fa-qrcode"></i> Project code/name <span class="tm-req">*</span>
+                </label>
+                <input id="mrs-project-code-name-search" class="tm-input"
+                       type="text" placeholder="Type project code/name to search…"
+                       autocomplete="off">
+                <input type="hidden" id="mrs-project-code-name">
+                <div id="mrs-project-code-name-results" class="tm-search-dropdown"></div>
+            </div>
+
             <!-- RIS reference search -->
-            <div class="tm-form-group">
+            <div class="tm-form-group" style="position:relative">
                 <label class="tm-label">
                     <i class="fas fa-receipt"></i> RIS Reference <span class="tm-req">*</span>
                 </label>
-                <div style="position:relative">
-                    <input id="mrs-ris-search" class="tm-input"
-                           type="text" placeholder="Type RIS number to search…"
-                           autocomplete="off">
-                    <div id="mrs-ris-results" style="
-                        display:none;position:absolute;top:100%;left:0;right:0;z-index:10;
-                        background:#fff;border:1.5px solid var(--teal-mid,#0e7c86);
-                        border-top:none;border-radius:0 0 8px 8px;
-                        max-height:200px;overflow-y:auto;
-                        box-shadow:0 8px 20px rgba(0,0,0,.12)">
-                    </div>
-                </div>
+                <input id="mrs-ris-search" class="tm-input"
+                       type="text" placeholder="Type RIS number to search…"
+                       autocomplete="off">
+                <input type="hidden" id="tm-mrs-ris">
+                <div id="mrs-ris-results" class="tm-search-dropdown"></div>
             </div>
 
             <!-- Selected RIS detail badge -->
             <div id="mrs-selected-ris-badge" style="display:none;
                  background:var(--teal-pale,#e6f7f8);border:1px solid var(--border,#d6eaec);
                  border-radius:10px;padding:12px 14px;
-                 display:none;flex-direction:column;gap:8px">
-                <div style="display:grid;grid-template-columns:1fr 1fr 1fr;gap:8px">
+                 flex-direction:column;gap:8px">
+                <div style="display:grid;grid-template-columns:1fr 1fr;gap:8px">
                     <div class="am-field">
                         <span class="am-lbl"><i class="fas fa-hashtag"></i> RIS No</span>
                         <span class="am-val" id="mrs-sel-risno">—</span>
                     </div>
-                    <div class="am-field">
-                        <span class="am-lbl"><i class="fas fa-cubes"></i> Qty Issued</span>
-                        <span class="am-val" id="mrs-sel-qtyissued">—</span>
-                    </div>
                     <div class="am-field">
                         <span class="am-lbl"><i class="fas fa-undo"></i> Max Return</span>
                         <span class="am-val" id="mrs-sel-maxreturn"
@@ -167,8 +168,8 @@
                 </div>
                 <div style="display:grid;grid-template-columns:1fr 1fr;gap:8px">
                     <div class="am-field">
-                        <span class="am-lbl"><i class="fas fa-box"></i> Item</span>
-                        <span class="am-val" id="mrs-sel-itemname">—</span>
+                        <span class="am-lbl"><i class="fas fa-diagram-project"></i> Project</span>
+                        <span class="am-val" id="mrs-sel-project">—</span>
                     </div>
                     <div class="am-field">
                         <span class="am-lbl"><i class="fas fa-tools"></i> Discipline</span>
@@ -207,7 +208,7 @@
                     <i class="fas fa-user"></i> Returned By <span class="tm-req">*</span>
                 </label>
                 <input id="mrs-create-returnedby" class="tm-input"
-                       type="text" placeholder="Name or user ID…">
+                       type="text" placeholder="Name…">
             </div>
 
             <div class="tm-form-group">
@@ -255,7 +256,9 @@
             <div>
                 <div style="font-size:14px;font-weight:600;color:#fff">Approve MRS</div>
                 <div id="mrs-approve-subtitle"
-                     style="font-size:11px;color:rgba(255,255,255,.65);margin-top:2px">—</div>
+                     style="font-size:11px;color:rgba(255,255,255,.65);margin-top:2px">
+                    —
+                </div>
             </div>
         </div>
         <div style="padding:20px 18px">
@@ -303,7 +306,9 @@
             <div>
                 <div style="font-size:14px;font-weight:600;color:#fff">Cancel MRS</div>
                 <div id="mrs-cancel-subtitle"
-                     style="font-size:11px;color:rgba(255,255,255,.65);margin-top:2px">—</div>
+                     style="font-size:11px;color:rgba(255,255,255,.65);margin-top:2px">
+                    —
+                </div>
             </div>
         </div>
         <div style="padding:20px 18px">
@@ -353,9 +358,17 @@
         gap: 16px;
         min-height: 220px;
     }
-    @@media (max-width: 768px)  { .mrs-grid { grid-template-columns: 1fr; } }
+
+    @@media (max-width: 768px) {
+        .mrs-grid {
+            grid-template-columns: 1fr;
+        }
+    }
+
     @@media (min-width: 769px) and (max-width: 1100px) {
-        .mrs-grid { grid-template-columns: repeat(2, 1fr); }
+        .mrs-grid {
+            grid-template-columns: repeat(2, 1fr);
+        }
     }
 
     /* ── MRS card ── */
@@ -369,7 +382,11 @@
         flex-direction: column;
         transition: box-shadow .25s, transform .25s;
     }
-    .mrs-card:hover { box-shadow: var(--shadow-hover); transform: translateY(-2px); }
+
+        .mrs-card:hover {
+            box-shadow: var(--shadow-hover);
+            transform: translateY(-2px);
+        }
 
     /* ── Card header — blue theme for MRS ── */
     .mrs-card-hd {
@@ -377,6 +394,7 @@
         padding: 14px 16px 12px;
         position: relative;
     }
+
     .mrs-card-no {
         font-size: .7rem;
         color: rgba(255,255,255,.6);
@@ -385,6 +403,7 @@
         text-transform: uppercase;
         margin-bottom: 3px;
     }
+
     .mrs-card-title {
         font-family: 'Space Grotesk', sans-serif;
         font-size: 1rem;
@@ -394,6 +413,7 @@
         word-break: break-word;
         margin-bottom: 6px;
     }
+
     .mrs-card-meta {
         display: flex;
         flex-wrap: wrap;
@@ -401,19 +421,40 @@
         font-size: 11px;
         color: rgba(255,255,255,.65);
     }
-    .mrs-card-meta span { display: flex; align-items: center; gap: 4px; }
+
+        .mrs-card-meta span {
+            display: flex;
+            align-items: center;
+            gap: 4px;
+        }
 
     /* ── Status badge ── */
     .mrs-status-badge {
         position: absolute;
-        top: 12px; right: 14px;
-        font-size: 10px; font-weight: 700;
-        padding: 3px 10px; border-radius: 50px;
-        letter-spacing: .05em; text-transform: uppercase;
+        top: 12px;
+        right: 14px;
+        font-size: 10px;
+        font-weight: 700;
+        padding: 3px 10px;
+        border-radius: 50px;
+        letter-spacing: .05em;
+        text-transform: uppercase;
+    }
+
+    .mrs-status-draft {
+        background: rgba(255,255,255,.18);
+        color: #fff;
+    }
+
+    .mrs-status-approved {
+        background: #dcfce7;
+        color: #166534;
+    }
+
+    .mrs-status-cancelled {
+        background: #fee2e2;
+        color: #991b1b;
     }
-    .mrs-status-draft     { background: rgba(255,255,255,.18); color: #fff; }
-    .mrs-status-approved  { background: #dcfce7; color: #166534; }
-    .mrs-status-cancelled { background: #fee2e2; color: #991b1b; }
 
     /* ── RIS reference strip ── */
     .mrs-ris-ref {
@@ -426,8 +467,15 @@
         font-size: 12px;
         color: #0C447C;
     }
-    .mrs-ris-ref i { font-size: 12px; flex-shrink: 0; }
-    .mrs-ris-ref strong { font-weight: 700; }
+
+        .mrs-ris-ref i {
+            font-size: 12px;
+            flex-shrink: 0;
+        }
+
+        .mrs-ris-ref strong {
+            font-weight: 700;
+        }
 
     /* ── Stats row ── */
     .mrs-stats-row {
@@ -437,836 +485,1126 @@
         background: var(--border, #d6eaec);
         border-bottom: 1px solid var(--border, #d6eaec);
     }
+
     .mrs-stat {
         background: var(--card-bg, #fff);
         padding: 10px 12px;
-        display: flex; flex-direction: column; gap: 2px;
+        display: flex;
+        flex-direction: column;
+        gap: 2px;
     }
+
     .mrs-stat-lbl {
-        font-size: 10px; font-weight: 700;
-        text-transform: uppercase; letter-spacing: .05em;
+        font-size: 10px;
+        font-weight: 700;
+        text-transform: uppercase;
+        letter-spacing: .05em;
         color: var(--text-muted, #6b8890);
-        display: flex; align-items: center; gap: 4px;
+        display: flex;
+        align-items: center;
+        gap: 4px;
     }
-    .mrs-stat-lbl i { font-size: 11px; }
+
+        .mrs-stat-lbl i {
+            font-size: 11px;
+        }
+
     .mrs-stat-val {
-        font-size: 18px; font-weight: 700;
-        color: var(--text-dark, #1a2e35); line-height: 1.2;
+        font-size: 18px;
+        font-weight: 700;
+        color: var(--text-dark, #1a2e35);
+        line-height: 1.2;
     }
-    .mrs-stat-val.blue  { color: #185FA5; }
-    .mrs-stat-val.green { color: #166534; }
-    .mrs-stat-val.amber { color: #92400e; }
+
+        .mrs-stat-val.blue {
+            color: #185FA5;
+        }
+
+        .mrs-stat-val.green {
+            color: #166534;
+        }
+
+        .mrs-stat-val.amber {
+            color: #92400e;
+        }
 
     /* ── Condition badge ── */
     .mrs-condition-badge {
-        display: inline-flex; align-items: center; gap: 5px;
-        padding: 3px 10px; border-radius: 50px;
-        font-size: 11px; font-weight: 600;
+        display: inline-flex;
+        align-items: center;
+        gap: 5px;
+        padding: 3px 10px;
+        border-radius: 50px;
+        font-size: 11px;
+        font-weight: 600;
+    }
+
+    .mrs-cond-good {
+        background: #dcfce7;
+        color: #166534;
+    }
+
+    .mrs-cond-damaged {
+        background: #fee2e2;
+        color: #991b1b;
+    }
+
+    .mrs-cond-partial {
+        background: #fef3c7;
+        color: #92400e;
     }
-    .mrs-cond-good    { background: #dcfce7; color: #166534; }
-    .mrs-cond-damaged { background: #fee2e2; color: #991b1b; }
-    .mrs-cond-partial { background: #fef3c7; color: #92400e; }
 
     /* ── Card body ── */
     .mrs-card-body {
-        padding: 12px 16px; flex: 1;
-        display: flex; flex-direction: column; gap: 8px;
+        padding: 12px 16px;
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
     }
+
     .mrs-field-row {
-        display: flex; align-items: flex-start;
-        gap: 8px; font-size: 12px;
+        display: flex;
+        align-items: flex-start;
+        gap: 8px;
+        font-size: 12px;
     }
+
     .mrs-field-lbl {
-        min-width: 84px; font-size: 10px; font-weight: 700;
-        text-transform: uppercase; letter-spacing: .05em;
+        min-width: 84px;
+        font-size: 10px;
+        font-weight: 700;
+        text-transform: uppercase;
+        letter-spacing: .05em;
         color: var(--text-muted, #6b8890);
-        padding-top: 1px; display: flex; align-items: center;
-        gap: 4px; flex-shrink: 0;
+        padding-top: 1px;
+        display: flex;
+        align-items: center;
+        gap: 4px;
+        flex-shrink: 0;
     }
-    .mrs-field-lbl i { font-size: 11px; }
+
+        .mrs-field-lbl i {
+            font-size: 11px;
+        }
+
     .mrs-field-val {
         color: var(--text-dark, #1a2e35);
-        line-height: 1.5; word-break: break-word;
+        line-height: 1.5;
+        word-break: break-word;
     }
 
     /* ── Footer ── */
     .mrs-card-ft {
         padding: 10px 16px 14px;
-        display: flex; gap: 8px;
+        display: flex;
+        gap: 8px;
         border-top: 1px solid var(--border, #d6eaec);
     }
+
     .mrs-btn {
-        flex: 1; padding: 8px 12px;
+        flex: 1;
+        padding: 8px 12px;
         border-radius: var(--radius-sm, 8px);
-        border: none; cursor: pointer;
+        border: none;
+        cursor: pointer;
         font-family: 'DM Sans', sans-serif;
-        font-size: .82rem; font-weight: 600;
-        display: flex; align-items: center;
-        justify-content: center; gap: 6px;
+        font-size: .82rem;
+        font-weight: 600;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 6px;
         transition: all .2s;
     }
-    .mrs-btn-approve { background: #0e7c86; color: #fff; }
-    .mrs-btn-approve:hover { background: #0d5c63; }
-    .mrs-btn-approve:disabled { opacity: .4; cursor: default; }
+
+    .mrs-btn-approve {
+        background: #0e7c86;
+        color: #fff;
+    }
+
+        .mrs-btn-approve:hover {
+            background: #0d5c63;
+        }
+
+        .mrs-btn-approve:disabled {
+            opacity: .4;
+            cursor: default;
+        }
 
     .mrs-btn-cancel {
-        background: transparent; color: #dc2626;
+        background: transparent;
+        color: #dc2626;
         border: 1.5px solid #fca5a5;
     }
-    .mrs-btn-cancel:hover { background: #fef2f2; border-color: #dc2626; }
-    .mrs-btn-cancel:disabled { opacity: .4; cursor: default; }
+
+        .mrs-btn-cancel:hover {
+            background: #fef2f2;
+            border-color: #dc2626;
+        }
+
+        .mrs-btn-cancel:disabled {
+            opacity: .4;
+            cursor: default;
+        }
 
     /* ── Create button (top of page) ── */
     .mrs-create-fab {
-        display: inline-flex; align-items: center; gap: 8px;
-        padding: 9px 18px; border-radius: 8px; border: none;
-        background: #185FA5; color: #fff;
+        display: inline-flex;
+        align-items: center;
+        gap: 8px;
+        padding: 9px 18px;
+        border-radius: 8px;
+        border: none;
+        background: #185FA5;
+        color: #fff;
         font-family: 'DM Sans', sans-serif;
-        font-size: .875rem; font-weight: 600;
-        cursor: pointer; transition: background .18s;
+        font-size: .875rem;
+        font-weight: 600;
+        cursor: pointer;
+        transition: background .18s;
         margin-bottom: 14px;
     }
-    .mrs-create-fab:hover { background: #0c3d6b; }
 
-    /* ── RIS search result items ── */
-    .mrs-ris-result-item {
-        padding: 10px 14px; cursor: pointer;
-        border-bottom: 1px solid var(--border, #d6eaec);
-        font-size: 13px; transition: background .12s;
-        display: flex; flex-direction: column; gap: 3px;
+        .mrs-create-fab:hover {
+            background: #0c3d6b;
+        }
+
+    /* ── Searchable dropdown panel (project / RIS) ── */
+    .tm-search-dropdown {
+        position: absolute;
+        top: 100%;
+        left: 0;
+        right: 0;
+        z-index: 1090;
+        margin-top: 4px;
+        max-height: 220px;
+        overflow-y: auto;
+        background: #fff;
+        border: 1.5px solid var(--border, #d6eaec);
+        border-radius: 8px;
+        box-shadow: 0 8px 24px rgba(0,0,0,.12);
+        display: none;
+    }
+
+        .tm-search-dropdown.open {
+            display: block;
+        }
+
+    /* ── RIS / Project search result items ── */
+    .mrs-ris-result-item {
+        padding: 10px 14px;
+        cursor: pointer;
+        border-bottom: 1px solid var(--border, #d6eaec);
+        font-size: 13px;
+        transition: background .12s;
+        display: flex;
+        flex-direction: column;
+        gap: 3px;
+    }
+
+        .mrs-ris-result-item:last-child {
+            border-bottom: none;
+        }
+
+        .mrs-ris-result-item:hover,
+        .mrs-ris-result-item.active {
+            background: var(--teal-pale, #e6f7f8);
+        }
+
+    .mrs-ris-result-no {
+        font-weight: 700;
+        color: var(--teal-dark, #0d5c63);
+    }
+
+    .mrs-ris-result-meta {
+        font-size: 11px;
+        color: var(--text-muted, #6b8890);
+    }
+
+    .mrs-ris-result-empty {
+        padding: 10px 14px;
+        font-size: 12px;
+        color: var(--text-muted, #6b8890);
     }
-    .mrs-ris-result-item:last-child { border-bottom: none; }
-    .mrs-ris-result-item:hover { background: var(--teal-pale, #e6f7f8); }
-    .mrs-ris-result-no { font-weight: 700; color: var(--teal-dark, #0d5c63); }
-    .mrs-ris-result-meta { font-size: 11px; color: var(--text-muted, #6b8890); }
 
     /* ── am-field reuse ── */
-    .am-field { display: flex; flex-direction: column; gap: 3px; }
-    .am-lbl {
-        font-size: 10px; font-weight: 700; text-transform: uppercase;
-        letter-spacing: .05em; color: var(--text-muted, #6b8890);
-        display: flex; align-items: center; gap: 4px;
+    .am-field {
+        display: flex;
+        flex-direction: column;
+        gap: 3px;
+    }
+
+    .am-lbl {
+        font-size: 10px;
+        font-weight: 700;
+        text-transform: uppercase;
+        letter-spacing: .05em;
+        color: var(--text-muted, #6b8890);
+        display: flex;
+        align-items: center;
+        gap: 4px;
+    }
+
+        .am-lbl i {
+            font-size: 11px;
+        }
+
+    .am-val {
+        font-size: 13px;
+        font-weight: 600;
+        color: var(--teal-dark, #0d5c63);
     }
-    .am-lbl i { font-size: 11px; }
-    .am-val { font-size: 13px; font-weight: 600; color: var(--teal-dark, #0d5c63); }
 </style>
 
 <script>
-(function () {
-    "use strict";
-    const H = window.InventoryHelpers;
+    (function () {
+        "use strict";
+        const H = window.InventoryHelpers;
 
-    // ── State ──────────────────────────────────────────────────────────────
-    const s = {
-        page: 1, pageSize: 12, totalCount: 0,
-        searchMRSNo: "", searchRISNo: "", searchItemName: "",
-        searchReturnedBy: "", status: "", condition: "",
-        timer: null
-    };
+        // ── State ──────────────────────────────────────────────────────────────
+        const s = {
+            page: 1, pageSize: 12, totalCount: 0,
+            searchMRSNo: "", searchRISNo: "", searchItemName: "",
+            searchReturnedBy: "", status: "", condition: "",
+            timer: null
+        };
 
-    // ── Selected RIS for create form ───────────────────────────────────────
-    let _selectedRIS = null;
+        // ── Selected values for the create form ──────────────────────────────
+        let _selectedRIS = null;          // { risId, risNo, discipline, maxReturn }
+        let _activeProjectCodeId = "";    // "" = no project filter active
+        let _projectSearchTimer  = null;
+        let _risSearchTimer      = null;
 
-    // ── Elements ───────────────────────────────────────────────────────────
-    const grid      = document.getElementById("mrs-grid");
-    const countEl   = document.getElementById("mrs-resultCount");
-    const inMRSNo   = document.getElementById("mrs-srchMRSNo");
-    const inRISNo   = document.getElementById("mrs-srchRISNo");
-    const inItem    = document.getElementById("mrs-srchItemName");
-    const inRby     = document.getElementById("mrs-srchReturnedBy");
-    const inSize    = document.getElementById("mrs-pageSize");
-    const statusWrap    = document.getElementById("mrs-statusWrap");
-    const conditionWrap = document.getElementById("mrs-conditionWrap");
+        // ── Elements ───────────────────────────────────────────────────────────
+        const grid      = document.getElementById("mrs-grid");
+        const countEl   = document.getElementById("mrs-resultCount");
+        const inMRSNo   = document.getElementById("mrs-srchMRSNo");
+        const inRISNo   = document.getElementById("mrs-srchRISNo");
+        const inItem    = document.getElementById("mrs-srchItemName");
+        const inRby     = document.getElementById("mrs-srchReturnedBy");
+        const inSize    = document.getElementById("mrs-pageSize");
+        const statusWrap    = document.getElementById("mrs-statusWrap");
+        const conditionWrap = document.getElementById("mrs-conditionWrap");
 
-    if (!grid || !statusWrap) {
-        console.error("MRS tab init failed — missing elements.");
-        return;
-    }
-
-    // ── Status dropdown (static) ───────────────────────────────────────────
-    const statusDropdown = H.initSearchDropdown(statusWrap, val => {
-        s.status = val;
-        s.page = 1;
-        fetchData();
-    }, { cssPrefix: "inv-dep", allLabel: "All Status",
-         allIcon: "fas fa-th-large", itemIcon: "fas fa-circle-dot" });
-    statusDropdown.setItems(["Draft", "Approved", "Cancelled"]);
-
-    // ── Condition dropdown (static) ────────────────────────────────────────
-    const condDropdown = H.initSearchDropdown(conditionWrap, val => {
-        s.condition = val;
-        s.page = 1;
-        fetchData();
-    }, { cssPrefix: "inv-dep", allLabel: "All Conditions",
-         allIcon: "fas fa-th-large", itemIcon: "fas fa-tag" });
-    condDropdown.setItems(["Good", "Damaged", "Partial"]);
-
-    // ── Search inputs ──────────────────────────────────────────────────────
-    [inMRSNo, inRISNo, inItem, inRby].forEach(el => {
-        if (!el) return;
-        el.addEventListener("input", () => {
-            clearTimeout(s.timer);
-            s.timer = setTimeout(() => {
-                s.searchMRSNo     = inMRSNo?.value.trim()  ?? "";
-                s.searchRISNo     = inRISNo?.value.trim()  ?? "";
-                s.searchItemName  = inItem?.value.trim()   ?? "";
-                s.searchReturnedBy = inRby?.value.trim()   ?? "";
-                s.page = 1;
-                fetchData();
-            }, 350);
-        });
-    });
-
-    if (inSize) inSize.addEventListener("change", () => {
-        s.pageSize = parseInt(inSize.value, 10);
-        s.page = 1;
-        fetchData();
-    });
-
-    function statusToCode(label) {
-        return { "Draft": "0", "Approved": "1", "Cancelled": "2" }[label] ?? "";
-    }
-
-    // ══════════════════════════════════════════════════════════════════════
-    //  FETCH MRS LIST
-    // ══════════════════════════════════════════════════════════════════════
-    async function fetchData() {
-        const g = document.getElementById("mrs-grid");
-        g.innerHTML = `<div class="inv-state" style="grid-column:1/-1">
-            <div class="inv-spinner"></div><p>Loading…</p></div>`;
-
-        const p = new URLSearchParams({
-            searchMRSNo:      s.searchMRSNo,
-            searchRISNo:      s.searchRISNo,
-            searchItemName:   s.searchItemName,
-            searchReturnedBy: s.searchReturnedBy,
-            status:           statusToCode(s.status),
-            condition:        s.condition,
-            pageNumber:       s.page,
-            pageSize:         s.pageSize,
-            draw:             Date.now()
-        });
-
-        try {
-          const res  = await fetch(`/MRSMgmt/GetMRS?${p}`);
-            if (!res.ok) throw new Error(`HTTP ${res.status}`);
-            const json = await res.json();
-
-                   const data = json.data ?? json;
-                    s.totalCount = json.recordsTotal ?? 0;
-
-            renderCards(json.data ?? []);
-
-            H.renderPagination(
-                document.getElementById("mrs-pageButtons"),
-                document.getElementById("mrs-pageInfo"),
-                s, pg => { s.page = pg; fetchData(); }
-            );
-
-            const c = document.getElementById("mrs-resultCount");
-            if (c) c.textContent =
-                `${s.totalCount.toLocaleString()} result${s.totalCount !== 1 ? "s" : ""}`;
-
-        } catch (err) {
-            console.error("GetMRS error:", err);
-            document.getElementById("mrs-grid").innerHTML =
-                `<div class="inv-state" style="grid-column:1/-1">
-                    <i class="fas fa-exclamation-triangle" style="color:#ff5c5c"></i>
-                    <p>Failed to load data.</p></div>`;
+        if (!grid || !statusWrap) {
+            console.error("MRS tab init failed — missing elements.");
+            return;
         }
-    }
 
-    // ══════════════════════════════════════════════════════════════════════
-    //  RENDER CARDS
-    // ══════════════════════════════════════════════════════════════════════
-    function renderCards(data) {
-        const g = document.getElementById("mrs-grid");
-        if (!data.length) {
+        // ── Status dropdown (static) ───────────────────────────────────────────
+        const statusDropdown = H.initSearchDropdown(statusWrap, val => {
+            s.status = val;
+            s.page = 1;
+            fetchData();
+        }, { cssPrefix: "inv-dep", allLabel: "All Status",
+             allIcon: "fas fa-th-large", itemIcon: "fas fa-circle-dot" });
+        statusDropdown.setItems(["Draft", "Approved", "Cancelled"]);
+
+        // ── Condition dropdown (static) ────────────────────────────────────────
+        const condDropdown = H.initSearchDropdown(conditionWrap, val => {
+            s.condition = val;
+            s.page = 1;
+            fetchData();
+        }, { cssPrefix: "inv-dep", allLabel: "All Conditions",
+             allIcon: "fas fa-th-large", itemIcon: "fas fa-tag" });
+        condDropdown.setItems(["Good", "Damaged", "Partial"]);
+
+        // ── Search inputs (list filter bar) ────────────────────────────────────
+        [inMRSNo, inRISNo, inItem, inRby].forEach(el => {
+            if (!el) return;
+            el.addEventListener("input", () => {
+                clearTimeout(s.timer);
+                s.timer = setTimeout(() => {
+                    s.searchMRSNo      = inMRSNo?.value.trim()  ?? "";
+                    s.searchRISNo      = inRISNo?.value.trim()  ?? "";
+                    s.searchItemName   = inItem?.value.trim()   ?? "";
+                    s.searchReturnedBy = inRby?.value.trim()    ?? "";
+                    s.page = 1;
+                    fetchData();
+                }, 350);
+            });
+        });
+
+        if (inSize) inSize.addEventListener("change", () => {
+            s.pageSize = parseInt(inSize.value, 10);
+            s.page = 1;
+            fetchData();
+        });
+
+        function statusToCode(label) {
+            return { "Draft": "0", "Approved": "1", "Cancelled": "2" }[label] ?? "";
+        }
+
+        // ══════════════════════════════════════════════════════════════════════
+        //  FETCH MRS LIST
+        // ══════════════════════════════════════════════════════════════════════
+        async function fetchData() {
+            const g = document.getElementById("mrs-grid");
             g.innerHTML = `<div class="inv-state" style="grid-column:1/-1">
-                <i class="fas fa-inbox"></i>
-                <p>No MRS records found.</p></div>`;
-            return;
-        }
+                <div class="inv-spinner"></div><p>Loading…</p></div>`;
 
-        g.innerHTML = data.map(item => buildMRSCardHtml(item)).join("");
-
-        g.querySelectorAll(".btn-mrs-approve").forEach(btn =>
-            btn.addEventListener("click", () =>
-                openApproveModal(parseInt(btn.dataset.mrsid, 10), btn.dataset))
-        );
-
-        g.querySelectorAll(".btn-mrs-cancel").forEach(btn =>
-            btn.addEventListener("click", () =>
-                openCancelModal(parseInt(btn.dataset.mrsid, 10), btn.dataset))
-        );
-    }
-
-    // ══════════════════════════════════════════════════════════════════════
-    //  CARD HTML BUILDER
-    // ══════════════════════════════════════════════════════════════════════
-    function buildMRSCardHtml(item) {
-        const mrsId       = item.mrsId       ?? item.MRSId       ?? 0;
-        const mrsNo       = item.mrsNo       ?? item.MRSNo       ?? "—";
-        const risNo       = item.risNo       ?? item.RISNo       ?? "—";
-        const risId       = item.risId       ?? item.RISId       ?? 0;
-        const itemName    = item.itemName    ?? item.ItemName    ?? "—";
-        const returnedBy  = item.returnedBy  ?? item.ReturnedBy  ?? "—";
-        const qtyReturned = item.qtyReturned ?? item.QtyReturned ?? 0;
-        const condition   = item.condition   ?? item.Condition   ?? "—";
-        const remarks     = item.remarks     ?? item.Remarks     ?? null;
-        const status      = item.status      ?? item.Status      ?? 0;
-        const statusLabel = item.statusLabel ?? item.StatusLabel ?? _statusLabel(status);
-        const createdDate = item.createdDate ?? item.CreatedDate ?? null;
-        const approvedBy  = item.approvedBy  ?? item.ApprovedBy  ?? null;
-        const approvedDate= item.approvedDate?? item.ApprovedDate?? null;
-
-        const isDraft     = status === 0;
-        const isApproved  = status === 1;
-        const isCancelled = status === 2;
-
-        const statusCls = isDraft ? "mrs-status-draft"
-                        : isApproved ? "mrs-status-approved"
-                        : "mrs-status-cancelled";
-
-        const statusIcon = isDraft ? "fas fa-clock"
-                         : isApproved ? "fas fa-check-circle"
-                         : "fas fa-ban";
-
-        const condCls = condition === "Good"    ? "mrs-cond-good"
-                      : condition === "Damaged" ? "mrs-cond-damaged"
-                      : "mrs-cond-partial";
-
-        const condIcon = condition === "Good"    ? "fas fa-check"
-                       : condition === "Damaged" ? "fas fa-exclamation-circle"
-                       : "fas fa-adjust";
-
-        return `
-        <div class="mrs-card">
-
-            <!-- HEAD -->
-            <div class="mrs-card-hd">
-                <span class="${statusCls} mrs-status-badge">
-                    <i class="${statusIcon}"></i> ${H.escHtml(statusLabel)}
-                </span>
-                <div class="mrs-card-no">MRS NO</div>
-                <div class="mrs-card-title">${H.escHtml(mrsNo)}</div>
-                <div class="mrs-card-meta">
-                    <span><i class="fas fa-box"></i> ${H.escHtml(itemName)}</span>
-                    <span><i class="fas fa-clock"></i> ${_formatDate(createdDate)}</span>
-                </div>
-                <div class="mrs-card-meta" style="margin-top:4px">
-                    <span><i class="fas fa-user"></i> ${H.escHtml(returnedBy)}</span>
-                </div>
-            </div>
-
-            <!-- RIS REFERENCE STRIP -->
-            <div class="mrs-ris-ref">
-                <i class="fas fa-receipt"></i>
-                <span>Against RIS: <strong>${H.escHtml(risNo)}</strong></span>
-            </div>
-
-            <!-- STATS -->
-            <div class="mrs-stats-row">
-                <div class="mrs-stat">
-                    <span class="mrs-stat-lbl">
-                        <i class="fas fa-undo"></i> Qty Returned
-                    </span>
-                    <span class="mrs-stat-val blue">${qtyReturned}</span>
-                </div>
-                <div class="mrs-stat">
-                    <span class="mrs-stat-lbl">
-                        <i class="fas fa-tag"></i> Condition
-                    </span>
-                    <span class="mrs-stat-val" style="font-size:13px;padding-top:3px">
-                        <span class="mrs-condition-badge ${condCls}">
-                            <i class="${condIcon}"></i> ${H.escHtml(condition)}
-                        </span>
-                    </span>
-                </div>
-                <div class="mrs-stat">
-                    <span class="mrs-stat-lbl">
-                        <i class="fas fa-hashtag"></i> Status
-                    </span>
-                    <span class="mrs-stat-val" style="font-size:13px;padding-top:3px">
-                        <span class="${statusCls} mrs-status-badge"
-                              style="position:static;font-size:10px">
-                            ${H.escHtml(statusLabel)}
-                        </span>
-                    </span>
-                </div>
-            </div>
-
-            <!-- BODY -->
-            <div class="mrs-card-body">
-                ${remarks ? `
-                <div class="mrs-field-row">
-                    <span class="mrs-field-lbl">
-                        <i class="fas fa-sticky-note"></i> Remarks
-                    </span>
-                    <span class="mrs-field-val"
-                          style="color:var(--text-muted,#6b8890)">
-                        ${H.escHtml(remarks)}
-                    </span>
-                </div>` : ""}
-
-                ${isApproved && approvedBy ? `
-                <div class="mrs-field-row">
-                    <span class="mrs-field-lbl">
-                        <i class="fas fa-user-check"></i> Approved by
-                    </span>
-                    <span class="mrs-field-val">
-                        ${H.escHtml(approvedBy)}
-                        <span style="color:var(--text-muted,#6b8890);
-                                     font-size:11px;margin-left:4px">
-                            ${_formatDate(approvedDate)}
-                        </span>
-                    </span>
-                </div>` : ""}
-            </div>
-
-            <!-- FOOTER -->
-            <div class="mrs-card-ft">
-                ${isDraft ? `
-                <button class="mrs-btn mrs-btn-approve btn-mrs-approve"
-                        data-mrsid="${mrsId}"
-                        data-mrsno="${H.escAttr(mrsNo)}"
-                        data-itemname="${H.escAttr(itemName)}"
-                        data-returnedby="${H.escAttr(returnedBy)}"
-                        data-qtyreturned="${qtyReturned}"
-                        data-condition="${H.escAttr(condition)}">
-                    <i class="fas fa-check-circle"></i> Approve
-                </button>
-                <button class="mrs-btn mrs-btn-cancel btn-mrs-cancel"
-                        data-mrsid="${mrsId}"
-                        data-mrsno="${H.escAttr(mrsNo)}"
-                        data-itemname="${H.escAttr(itemName)}"
-                        data-returnedby="${H.escAttr(returnedBy)}"
-                        data-qtyreturned="${qtyReturned}">
-                    <i class="fas fa-ban"></i> Cancel
-                </button>` : `
-                <button class="mrs-btn mrs-btn-cancel btn-mrs-cancel"
-                        ${isCancelled ? "disabled" : ""}
-                        data-mrsid="${mrsId}"
-                        data-mrsno="${H.escAttr(mrsNo)}"
-                        data-itemname="${H.escAttr(itemName)}"
-                        data-returnedby="${H.escAttr(returnedBy)}"
-                        data-qtyreturned="${qtyReturned}"
-                        style="flex:1">
-                    <i class="fas fa-ban"></i>
-                    ${isCancelled ? "Cancelled" : "Cancel"}
-                </button>`}
-            </div>
-
-        </div>`;
-    }
-
-    // ══════════════════════════════════════════════════════════════════════
-    //  CREATE MRS MODAL
-    // ══════════════════════════════════════════════════════════════════════
-    function openCreateModal() {
-        _selectedRIS = null;
-        const overlay = document.getElementById("mrs-create-overlay");
-
-        // Reset form
-        document.getElementById("mrs-ris-search").value     = "";
-        document.getElementById("mrs-create-qty").value     = "";
-        document.getElementById("mrs-create-qty").disabled  = true;
-        document.getElementById("mrs-create-returnedby").value = "";
-        document.getElementById("mrs-create-remarks").value    = "";
-        document.getElementById("mrs-create-condition").value  = "Good";
-        document.getElementById("mrs-selected-ris-badge").style.display = "none";
-        document.getElementById("mrs-ris-results").style.display        = "none";
-        document.getElementById("mrs-create-qty-warn").style.display    = "none";
-        document.getElementById("mrs-create-qty-hint").style.display    = "none";
-        document.getElementById("mrs-create-submit-btn").disabled       = true;
-
-        overlay.style.display = "flex";
-        document.getElementById("mrs-ris-search").focus();
-
-        // Wire close
-        const closeModal = () => { overlay.style.display = "none"; };
-        document.getElementById("mrs-create-close").onclick  = closeModal;
-        document.getElementById("mrs-create-cancel-btn").onclick = closeModal;
-        overlay.onclick = e => { if (e.target === overlay) closeModal(); };
-
-        // RIS search input with debounce
-        let risSearchTimer;
-        document.getElementById("mrs-ris-search").oninput = () => {
-            clearTimeout(risSearchTimer);
-            risSearchTimer = setTimeout(_searchRIS, 300);
-        };
-
-        // Qty validation
-        document.getElementById("mrs-create-qty").oninput = _validateCreateQty;
-
-        // Submit
-        const submitBtn = document.getElementById("mrs-create-submit-btn");
-        const newSubmit = submitBtn.cloneNode(true);
-        submitBtn.replaceWith(newSubmit);
-        newSubmit.addEventListener("click", _handleCreateSubmit);
-    }
-
-    // RIS live search
-    async function _searchRIS() {
-        const q       = document.getElementById("mrs-ris-search").value.trim();
-        const results = document.getElementById("mrs-ris-results");
-
-        if (!q) { results.style.display = "none"; return; }
-
-        results.style.display = "block";
-        results.innerHTML = `<div style="padding:10px 14px;font-size:12px;
-            color:var(--text-muted,#6b8890)">
-            <i class="fas fa-spinner fa-spin"></i> Searching…</div>`;
-
-        try {
-                  const res  = await fetch(
-                    `/RISMgmt/GetRIS?searchRISNo=${encodeURIComponent(q)}&status=1&pageSize=10`
-                );
-          //  const res  = await fetch(`/RISMgmt/GetRIS?q=${encodeURIComponent(q)}`);
-            const json = await res.json();
-            const list = (json.data ?? json).data ?? json.data ?? [];
-
-            if (!list.length) {
-                results.innerHTML = `<div style="padding:10px 14px;font-size:12px;
-                    color:var(--text-muted,#6b8890)">No approved RIS found.</div>`;
-                return;
-            }
-
-            results.innerHTML = list.map(r => `
-                <div class="mrs-ris-result-item"
-                     data-risid="${r.risId ?? r.RISId}"
-                     data-risno="${H.escAttr(r.risNo ?? r.RISNo ?? '')}"
-                     data-itemname="${H.escAttr(r.itemName ?? r.ItemName ?? '')}"
-                     data-discipline="${H.escAttr(r.disciplineName ?? r.DisciplineName ?? '')}"
-                     data-qtyissued="${r.qtyIssued ?? r.QtyIssued ?? 0}"
-                     data-maxreturn="${r.qtyAvailableToReturn ?? (r.qtyIssued - r.totalReturned) ?? 0}">
-                    <span class="mrs-ris-result-no">
-                        ${H.escHtml(r.risNo ?? r.RISNo ?? '—')}
-                    </span>
-                    <span class="mrs-ris-result-meta">
-                        ${H.escHtml(r.itemName ?? r.ItemName ?? '—')} ·
-                        ${H.escHtml(r.disciplineName ?? r.DisciplineName ?? '—')} ·
-                        <strong>${r.qtyAvailableToReturn ?? 0} pcs available</strong>
-                    </span>
-                </div>`).join("");
-
-            results.querySelectorAll(".mrs-ris-result-item").forEach(el =>
-                el.addEventListener("click", () => _selectRIS(el.dataset))
-            );
-
-        } catch (err) {
-            results.innerHTML = `<div style="padding:10px 14px;font-size:12px;color:#dc2626">
-                Search failed.</div>`;
-        }
-    }
-
-    function _selectRIS(dataset) {
-        _selectedRIS = {
-            risId:        parseInt(dataset.risid, 10),
-            risNo:        dataset.risno,
-            itemName:     dataset.itemname,
-            discipline:   dataset.discipline,
-            qtyIssued:    parseInt(dataset.qtyissued, 10),
-            maxReturn:    parseInt(dataset.maxreturn, 10)
-        };
-
-        document.getElementById("mrs-ris-search").value        = _selectedRIS.risNo;
-        document.getElementById("mrs-ris-results").style.display = "none";
-
-        // Populate badge
-        document.getElementById("mrs-sel-risno").textContent      = _selectedRIS.risNo;
-        document.getElementById("mrs-sel-qtyissued").textContent   = _selectedRIS.qtyIssued + " pcs";
-        document.getElementById("mrs-sel-maxreturn").textContent   = _selectedRIS.maxReturn + " pcs";
-        document.getElementById("mrs-sel-itemname").textContent    = _selectedRIS.itemName;
-        document.getElementById("mrs-sel-discipline").textContent  = _selectedRIS.discipline;
-
-        const badge = document.getElementById("mrs-selected-ris-badge");
-        badge.style.display = "flex";
-
-        const qtyEl = document.getElementById("mrs-create-qty");
-        qtyEl.disabled = false;
-        qtyEl.max      = _selectedRIS.maxReturn;
-        qtyEl.value    = "";
-        qtyEl.focus();
-
-        const hint = document.getElementById("mrs-create-qty-hint");
-        hint.style.display  = "block";
-        hint.textContent    = `Max returnable: ${_selectedRIS.maxReturn} pcs`;
-
-        document.getElementById("mrs-create-submit-btn").disabled = false;
-        document.getElementById("mrs-create-subtitle").textContent =
-            `${_selectedRIS.risNo} — ${_selectedRIS.itemName}`;
-    }
-
-    function _validateCreateQty() {
-        const val  = parseInt(document.getElementById("mrs-create-qty").value, 10);
-        const max  = _selectedRIS?.maxReturn ?? 0;
-        const warn = document.getElementById("mrs-create-qty-warn");
-        const txt  = document.getElementById("mrs-create-qty-warn-text");
-        const el   = document.getElementById("mrs-create-qty");
-
-        const over = !isNaN(val) && val > max;
-        const zero = !isNaN(val) && val < 1;
-
-        txt.textContent = over ? `Cannot exceed ${max} available.`
-                        : zero ? "Must be at least 1." : "";
-        warn.style.display = (over || zero) ? "flex" : "none";
-        el.classList.toggle("error", over || zero);
-    }
-
-    async function _handleCreateSubmit() {
-        if (!_selectedRIS) {
-            showToast("warning", "Please select a RIS reference.", "Required", 3000);
-            return;
-        }
-
-        const qty       = parseInt(document.getElementById("mrs-create-qty").value, 10);
-        const returnedBy = document.getElementById("mrs-create-returnedby").value.trim();
-        const condition = document.getElementById("mrs-create-condition").value;
-        const remarks   = document.getElementById("mrs-create-remarks").value.trim();
-
-        let valid = true;
-        if (isNaN(qty) || qty < 1 || qty > _selectedRIS.maxReturn) {
-            document.getElementById("mrs-create-qty").classList.add("error");
-            valid = false;
-        }
-        if (!returnedBy) {
-            document.getElementById("mrs-create-returnedby").classList.add("error");
-            valid = false;
-        }
-        if (!valid) {
-            showToast("warning", "Please fix the highlighted fields.", "Validation", 3000);
-            return;
-        }
-
-        const btn = document.getElementById("mrs-create-submit-btn");
-        btn.disabled = true;
-        btn.querySelector("i").className = "fas fa-spinner fa-spin";
-
-        try {
-            const res  = await fetch("/MRSMgmt/CreateMRS", {
-                method:  "POST",
-                headers: { "Content-Type": "application/json" },
-                body:    JSON.stringify({
-                    RISId:       _selectedRIS.risId,
-                    QtyReturned: qty,
-                    ReturnedBy:  returnedBy,
-                    Condition:   condition,
-                    Remarks:     remarks || null
-                })
+            const p = new URLSearchParams({
+                searchMRSNo:      s.searchMRSNo,
+                searchRISNo:      s.searchRISNo,
+                searchItemName:   s.searchItemName,
+                searchReturnedBy: s.searchReturnedBy,
+                status:           statusToCode(s.status),
+                condition:        s.condition,
+                pageNumber:       s.page,
+                pageSize:         s.pageSize,
+                draw:             Date.now()
             });
 
-            const json = await res.json();
-            const d    = json.data ?? json;
+            try {
+                const res  = await fetch(`/MRSMgmt/GetMRS?${p}`);
+                if (!res.ok) throw new Error(`HTTP ${res.status}`);
+                const json = await res.json();
 
-            if (!res.ok || !d.success) {
-                showToast("error", d.message ?? "Could not create MRS.", "Failed", 4000);
-                return;
-            }
+                s.totalCount = json.recordsTotal ?? 0;
 
-            showToast("success", d.message ?? "MRS created successfully.", "Done!", 3500);
-            document.getElementById("mrs-create-overlay").style.display = "none";
-            fetchData();
+                renderCards(json.data ?? []);
 
-        } catch (err) {
-            console.error("CreateMRS error:", err);
-            showToast("error", "Request failed. Please try again.", "Error", 4000);
-        } finally {
-            if (document.getElementById("mrs-create-overlay").style.display !== "none") {
-                btn.disabled = false;
-                btn.querySelector("i").className = "fas fa-file-import";
+                H.renderPagination(
+                    document.getElementById("mrs-pageButtons"),
+                    document.getElementById("mrs-pageInfo"),
+                    s, pg => { s.page = pg; fetchData(); }
+                );
+
+                const c = document.getElementById("mrs-resultCount");
+                if (c) c.textContent =
+                    `${s.totalCount.toLocaleString()} result${s.totalCount !== 1 ? "s" : ""}`;
+
+            } catch (err) {
+                console.error("GetMRS error:", err);
+                document.getElementById("mrs-grid").innerHTML =
+                    `<div class="inv-state" style="grid-column:1/-1">
+                        <i class="fas fa-exclamation-triangle" style="color:#ff5c5c"></i>
+                        <p>Failed to load data.</p></div>`;
             }
         }
-    }
 
-    // ══════════════════════════════════════════════════════════════════════
-    //  APPROVE MRS MODAL
-    // ══════════════════════════════════════════════════════════════════════
-    function openApproveModal(mrsId, dataset) {
-        const overlay = document.getElementById("mrs-approve-overlay");
-
-        document.getElementById("mrs-approve-subtitle").textContent =
-            `${dataset.mrsno} — ${dataset.itemname ?? ""}`;
-
-        document.getElementById("mrs-approve-detail").innerHTML = `
-            <div class="am-field">
-                <span class="am-lbl"><i class="fas fa-hashtag"></i> MRS No</span>
-                <span class="am-val">${H.escHtml(dataset.mrsno)}</span>
-            </div>
-            <div class="am-field">
-                <span class="am-lbl"><i class="fas fa-undo"></i> Qty Returned</span>
-                <span class="am-val">${dataset.qtyreturned ?? 0} pcs</span>
-            </div>
-            <div class="am-field">
-                <span class="am-lbl"><i class="fas fa-box"></i> Item</span>
-                <span class="am-val">${H.escHtml(dataset.itemname ?? "—")}</span>
-            </div>
-            <div class="am-field">
-                <span class="am-lbl"><i class="fas fa-user"></i> Returned By</span>
-                <span class="am-val">${H.escHtml(dataset.returnedby ?? "—")}</span>
-            </div>
-            <div class="am-field">
-                <span class="am-lbl"><i class="fas fa-tag"></i> Condition</span>
-                <span class="am-val">${H.escHtml(dataset.condition ?? "—")}</span>
-            </div>`;
-
-        overlay.style.display = "flex";
-
-        const closeModal  = () => { overlay.style.display = "none"; };
-        const confirmBtn  = document.getElementById("mrs-approve-confirm-btn");
-        const cancelBtn   = document.getElementById("mrs-approve-cancel-btn");
-        const newConfirm  = confirmBtn.cloneNode(true);
-        const newCancel   = cancelBtn.cloneNode(true);
-        confirmBtn.replaceWith(newConfirm);
-        cancelBtn.replaceWith(newCancel);
-
-        newCancel.addEventListener("click", closeModal);
-        overlay.addEventListener("click", e => { if (e.target === overlay) closeModal(); });
-
-        newConfirm.addEventListener("click", async () => {
-            newConfirm.disabled = true;
-            newConfirm.innerHTML = `<i class="fas fa-spinner fa-spin"></i> Approving…`;
-            try {
-                const res  = await fetch("/MRSMgmt/ApproveMRS", {
-                    method:  "POST",
-                    headers: { "Content-Type": "application/json" },
-                    body:    JSON.stringify({ mrsId })
-                });
-                const json = await res.json();
-                const d    = json.data ?? json;
-
-                if (!res.ok || !d.success) {
-                    showToast("error", d.message ?? "Could not approve MRS.", "Failed", 4000);
-                    return;
-                }
-                showToast("success", d.message ?? "MRS approved.", "Approved!", 3500);
-                closeModal();
-                fetchData();
-            } catch (err) {
-                console.error("ApproveMRS error:", err);
-                showToast("error", "Request failed.", "Error", 4000);
-            } finally {
-                newConfirm.disabled = false;
-                newConfirm.innerHTML = `<i class="fas fa-check"></i> Approve MRS`;
-            }
-        });
-    }
-
-    // ══════════════════════════════════════════════════════════════════════
-    //  CANCEL MRS MODAL
-    // ══════════════════════════════════════════════════════════════════════
-    function openCancelModal(mrsId, dataset) {
-        const overlay  = document.getElementById("mrs-cancel-overlay");
-        const reasonEl = document.getElementById("mrs-cancel-reason");
-        reasonEl.value = "";
-        reasonEl.classList.remove("error");
-
-        document.getElementById("mrs-cancel-subtitle").textContent =
-            `${dataset.mrsno} — ${dataset.itemname ?? ""}`;
-
-        document.getElementById("mrs-cancel-detail").innerHTML = `
-            <div class="am-field">
-                <span class="am-lbl"><i class="fas fa-hashtag"></i> MRS No</span>
-                <span class="am-val" style="color:#991b1b">
-                    ${H.escHtml(dataset.mrsno)}
-                </span>
-            </div>
-            <div class="am-field">
-                <span class="am-lbl"><i class="fas fa-undo"></i> Qty Returned</span>
-                <span class="am-val" style="color:#991b1b">
-                    ${dataset.qtyreturned ?? 0} pcs
-                </span>
-            </div>
-            <div class="am-field">
-                <span class="am-lbl"><i class="fas fa-box"></i> Item</span>
-                <span class="am-val">${H.escHtml(dataset.itemname ?? "—")}</span>
-            </div>
-            <div class="am-field">
-                <span class="am-lbl"><i class="fas fa-user"></i> Returned By</span>
-                <span class="am-val">${H.escHtml(dataset.returnedby ?? "—")}</span>
-            </div>`;
-
-        overlay.style.display = "flex";
-
-        const closeModal = () => { overlay.style.display = "none"; };
-        const confirmBtn = document.getElementById("mrs-cancel-confirm-btn");
-        const dismissBtn = document.getElementById("mrs-cancel-dismiss-btn");
-        const newConfirm = confirmBtn.cloneNode(true);
-        const newDismiss = dismissBtn.cloneNode(true);
-        confirmBtn.replaceWith(newConfirm);
-        dismissBtn.replaceWith(newDismiss);
-
-        newDismiss.addEventListener("click", closeModal);
-        overlay.addEventListener("click", e => { if (e.target === overlay) closeModal(); });
-
-        newConfirm.addEventListener("click", async () => {
-            const reason = reasonEl.value.trim();
-            if (!reason) {
-                reasonEl.classList.add("error");
-                reasonEl.focus();
-                showToast("warning", "Please enter a reason for cancellation.", "Required", 3000);
+        // ══════════════════════════════════════════════════════════════════════
+        //  RENDER CARDS
+        // ══════════════════════════════════════════════════════════════════════
+        function renderCards(data) {
+            const g = document.getElementById("mrs-grid");
+            if (!data.length) {
+                g.innerHTML = `<div class="inv-state" style="grid-column:1/-1">
+                    <i class="fas fa-inbox"></i>
+                    <p>No MRS records found.</p></div>`;
                 return;
             }
 
-            newConfirm.disabled = true;
-            newConfirm.innerHTML = `<i class="fas fa-spinner fa-spin"></i> Cancelling…`;
+            g.innerHTML = data.map(item => buildMRSCardHtml(item)).join("");
+
+            g.querySelectorAll(".btn-mrs-approve").forEach(btn =>
+                btn.addEventListener("click", () =>
+                    openApproveModal(parseInt(btn.dataset.mrsid, 10), btn.dataset))
+            );
+
+            g.querySelectorAll(".btn-mrs-cancel").forEach(btn =>
+                btn.addEventListener("click", () =>
+                    openCancelModal(parseInt(btn.dataset.mrsid, 10), btn.dataset))
+            );
+        }
+
+        // ══════════════════════════════════════════════════════════════════════
+        //  CARD HTML BUILDER
+        // ══════════════════════════════════════════════════════════════════════
+        function buildMRSCardHtml(item) {
+            const mrsId        = item.mrsId        ?? item.MRSId        ?? 0;
+            const mrsNo        = item.mrsNo        ?? item.MRSNo        ?? "—";
+            const risNo        = item.risNo        ?? item.RISNo        ?? "—";
+            const itemName     = item.itemName     ?? item.ItemName     ?? "—";
+            const returnedBy   = item.returnedBy   ?? item.ReturnedBy   ?? "—";
+            const qtyReturned  = item.qtyReturned  ?? item.QtyReturned  ?? 0;
+            const condition    = item.condition    ?? item.Condition    ?? "—";
+            const remarks      = item.remarks      ?? item.Remarks      ?? null;
+            const status       = item.status       ?? item.Status       ?? 0;
+            const statusLabel  = item.statusLabel  ?? item.StatusLabel  ?? _statusLabel(status);
+            const createdDate  = item.createdDate  ?? item.CreatedDate  ?? null;
+            const approvedBy   = item.approvedBy   ?? item.ApprovedBy   ?? null;
+            const approvedDate = item.approvedDate ?? item.ApprovedDate ?? null;
+
+            const isDraft     = status === 0;
+            const isApproved  = status === 1;
+            const isCancelled = status === 2;
+
+            const statusCls = isDraft ? "mrs-status-draft"
+                            : isApproved ? "mrs-status-approved"
+                            : "mrs-status-cancelled";
+
+            const statusIcon = isDraft ? "fas fa-clock"
+                             : isApproved ? "fas fa-check-circle"
+                             : "fas fa-ban";
+
+            const condCls = condition === "Good"    ? "mrs-cond-good"
+                          : condition === "Damaged" ? "mrs-cond-damaged"
+                          : "mrs-cond-partial";
+
+            const condIcon = condition === "Good"    ? "fas fa-check"
+                           : condition === "Damaged" ? "fas fa-exclamation-circle"
+                           : "fas fa-adjust";
+
+            return `
+            <div class="mrs-card">
+
+                <!-- HEAD -->
+                <div class="mrs-card-hd">
+                    <span class="${statusCls} mrs-status-badge">
+                        <i class="${statusIcon}"></i> ${H.escHtml(statusLabel)}
+                    </span>
+                    <div class="mrs-card-no">MRS NO</div>
+                    <div class="mrs-card-title">${H.escHtml(mrsNo)}</div>
+                    <div class="mrs-card-meta">
+                        <span><i class="fas fa-box"></i> ${H.escHtml(itemName)}</span>
+                        <span><i class="fas fa-clock"></i> ${_formatDate(createdDate)}</span>
+                    </div>
+                    <div class="mrs-card-meta" style="margin-top:4px">
+                        <span><i class="fas fa-user"></i> ${H.escHtml(returnedBy)}</span>
+                    </div>
+                </div>
+
+                <!-- RIS REFERENCE STRIP -->
+                <div class="mrs-ris-ref">
+                    <i class="fas fa-receipt"></i>
+                    <span>Against RIS: <strong>${H.escHtml(risNo)}</strong></span>
+                </div>
+
+                <!-- STATS -->
+                <div class="mrs-stats-row">
+                    <div class="mrs-stat">
+                        <span class="mrs-stat-lbl">
+                            <i class="fas fa-undo"></i> Qty Returned
+                        </span>
+                        <span class="mrs-stat-val blue">${qtyReturned}</span>
+                    </div>
+                    <div class="mrs-stat">
+                        <span class="mrs-stat-lbl">
+                            <i class="fas fa-tag"></i> Condition
+                        </span>
+                        <span class="mrs-stat-val" style="font-size:13px;padding-top:3px">
+                            <span class="mrs-condition-badge ${condCls}">
+                                <i class="${condIcon}"></i> ${H.escHtml(condition)}
+                            </span>
+                        </span>
+                    </div>
+                    <div class="mrs-stat">
+                        <span class="mrs-stat-lbl">
+                            <i class="fas fa-hashtag"></i> Status
+                        </span>
+                        <span class="mrs-stat-val" style="font-size:13px;padding-top:3px">
+                            <span class="${statusCls} mrs-status-badge"
+                                  style="position:static;font-size:10px">
+                                ${H.escHtml(statusLabel)}
+                            </span>
+                        </span>
+                    </div>
+                </div>
+
+                <!-- BODY -->
+                <div class="mrs-card-body">
+                    ${remarks ? `
+                    <div class="mrs-field-row">
+                        <span class="mrs-field-lbl">
+                            <i class="fas fa-sticky-note"></i> Remarks
+                        </span>
+                        <span class="mrs-field-val"
+                              style="color:var(--text-muted,#6b8890)">
+                            ${H.escHtml(remarks)}
+                        </span>
+                    </div>` : ""}
+
+                    ${isApproved && approvedBy ? `
+                    <div class="mrs-field-row">
+                        <span class="mrs-field-lbl">
+                            <i class="fas fa-user-check"></i> Approved by
+                        </span>
+                        <span class="mrs-field-val">
+                            ${H.escHtml(approvedBy)}
+                            <span style="color:var(--text-muted,#6b8890);
+                                         font-size:11px;margin-left:4px">
+                                ${_formatDate(approvedDate)}
+                            </span>
+                        </span>
+                    </div>` : ""}
+                </div>
+
+                 <!-- FOOTER here-->
+
+            </div>`;
+        }
+
+        // <!-- FOOTER once the is approval it must be added-->
+                // <div class="mrs-card-ft">
+                //     ${isDraft ? `
+                //     <button class="mrs-btn mrs-btn-approve btn-mrs-approve"
+                //             data-mrsid="${mrsId}"
+                //             data-mrsno="${H.escAttr(mrsNo)}"
+                //             data-itemname="${H.escAttr(itemName)}"
+                //             data-returnedby="${H.escAttr(returnedBy)}"
+                //             data-qtyreturned="${qtyReturned}"
+                //             data-condition="${H.escAttr(condition)}">
+                //         <i class="fas fa-check-circle"></i> Approve
+                //     </button>
+
+                //     <button class="mrs-btn mrs-btn-cancel btn-mrs-cancel"
+                //             data-mrsid="${mrsId}"
+                //             data-mrsno="${H.escAttr(mrsNo)}"
+                //             data-itemname="${H.escAttr(itemName)}"
+                //             data-returnedby="${H.escAttr(returnedBy)}"
+                //             data-qtyreturned="${qtyReturned}">
+                //         <i class="fas fa-ban"></i> Cancel
+                //     </button>` : `
+                //     <button class="mrs-btn mrs-btn-cancel btn-mrs-cancel"
+                //             ${isCancelled ? "disabled" : ""}
+                //             data-mrsid="${mrsId}"
+                //             data-mrsno="${H.escAttr(mrsNo)}"
+                //             data-itemname="${H.escAttr(itemName)}"
+                //             data-returnedby="${H.escAttr(returnedBy)}"
+                //             data-qtyreturned="${qtyReturned}"
+                //             style="flex:1">
+                //         <i class="fas fa-ban"></i>
+                //         ${isCancelled ? "Cancelled" : "Cancel"}
+                //     </button>`
+                // }
+                // </div>
+        // ══════════════════════════════════════════════════════════════════════
+        //  CREATE MRS MODAL
+        // ══════════════════════════════════════════════════════════════════════
+
+        function openCreateModal() {
+            _selectedRIS = null;
+            _activeProjectCodeId = "";
+            const overlay = document.getElementById("mrs-create-overlay");
+
+            // Reset form
+            document.getElementById("mrs-project-code-name-search").value = "";
+            document.getElementById("mrs-project-code-name").value        = "";
+            document.getElementById("mrs-ris-search").value     = "";
+            document.getElementById("tm-mrs-ris").value          = "";
+            document.getElementById("mrs-create-qty").value     = "";
+            document.getElementById("mrs-create-qty").disabled  = true;
+            document.getElementById("mrs-create-returnedby").value = "";
+            document.getElementById("mrs-create-remarks").value    = "";
+            document.getElementById("mrs-create-condition").value  = "Good";
+            document.getElementById("mrs-selected-ris-badge").style.display = "none";
+            document.getElementById("mrs-ris-results").classList.remove("open");
+            document.getElementById("mrs-project-code-name-results").classList.remove("open");
+            document.getElementById("mrs-create-qty-warn").style.display    = "none";
+            document.getElementById("mrs-create-qty-hint").style.display    = "none";
+            document.getElementById("mrs-create-submit-btn").disabled       = true;
+            document.getElementById("mrs-create-subtitle").textContent =
+                "Select an approved RIS to return against";
+
+            overlay.style.display = "flex";
+            document.getElementById("mrs-project-code-name-search").focus();
+
+            // Wire close
+            const closeModal = () => { overlay.style.display = "none"; };
+            document.getElementById("mrs-create-close").onclick      = closeModal;
+            document.getElementById("mrs-create-cancel-btn").onclick = closeModal;
+            overlay.onclick = e => { if (e.target === overlay) closeModal(); };
+
+            // Close dropdowns when clicking outside them
+            document.addEventListener("click", _onOutsideClickForSearchPanels);
+
+            // Project search input with debounce
+            document.getElementById("mrs-project-code-name-search").oninput = () => {
+                document.getElementById("mrs-project-code-name").value = "";
+                _activeProjectCodeId = "";
+                clearTimeout(_projectSearchTimer);
+                _projectSearchTimer = setTimeout(_searchProjects, 300);
+                // Project text cleared -> RIS pool should widen back to unfiltered
+                clearTimeout(_risSearchTimer);
+                _risSearchTimer = setTimeout(_searchRIS, 300);
+            };
+            document.getElementById("mrs-project-code-name-search").onfocus = _searchProjects;
+
+            // RIS search input with debounce
+            document.getElementById("mrs-ris-search").oninput = () => {
+                clearTimeout(_risSearchTimer);
+                _risSearchTimer = setTimeout(_searchRIS, 300);
+            };
+            document.getElementById("mrs-ris-search").onfocus = _searchRIS;
+
+            // Qty validation
+            document.getElementById("mrs-create-qty").oninput = _validateCreateQty;
+
+            // Submit
+            const submitBtn = document.getElementById("mrs-create-submit-btn");
+            const newSubmit = submitBtn.cloneNode(true);
+            submitBtn.replaceWith(newSubmit);
+            newSubmit.addEventListener("click", _handleCreateSubmit);
+        }
+
+        function _onOutsideClickForSearchPanels(e) {
+            const projSearch  = document.getElementById("mrs-project-code-name-search");
+            const projResults = document.getElementById("mrs-project-code-name-results");
+            const risSearch   = document.getElementById("mrs-ris-search");
+            const risResults  = document.getElementById("mrs-ris-results");
+
+            if (projSearch && projResults &&
+                !projSearch.contains(e.target) && !projResults.contains(e.target)) {
+                projResults.classList.remove("open");
+            }
+            if (risSearch && risResults &&
+                !risSearch.contains(e.target) && !risResults.contains(e.target)) {
+                risResults.classList.remove("open");
+            }
+        }
+
+        // ── Project live search ────────────────────────────────────────────────
+        // Endpoint: GET /MRSMgmt/SearchProjects?searchProjectCode={text}
+        async function _searchProjects() {
+            const q       = document.getElementById("mrs-project-code-name-search").value.trim();
+            const results = document.getElementById("mrs-project-code-name-results");
+
+            results.classList.add("open");
+            results.innerHTML = `<div class="mrs-ris-result-empty">
+                <i class="fas fa-spinner fa-spin"></i> Searching…</div>`;
 
             try {
-                const res  = await fetch("/MRSMgmt/CancelMRS", {
+                const params = new URLSearchParams();
+                if (q) params.set("searchProjectCode", q);
+
+                const res  = await fetch(`/MRSMgmt/SearchProjects?${params.toString()}`);
+                if (!res.ok) throw new Error(`HTTP ${res.status}`);
+                const json = await res.json();
+                const list = json.data ?? [];
+
+                if (!list.length) {
+                    results.innerHTML = `<div class="mrs-ris-result-empty">No matching projects.</div>`;
+                    return;
+                }
+
+                results.innerHTML = list.map(p => {
+                    const id   = p.projectCodeId ?? p.ProjectCodeId;
+                    const code = p.projectCode   ?? p.ProjectCode   ?? "N/A";
+                    const name = p.projectName   ?? p.ProjectName   ?? "N/A";
+                    return `
+                    <div class="mrs-ris-result-item"
+                         data-projectcodeid="${id}"
+                         data-projectcode="${H.escAttr(code)}"
+                         data-projectname="${H.escAttr(name)}">
+                        <span class="mrs-ris-result-no">${H.escHtml(name)}</span>
+                        <span class="mrs-ris-result-meta">${H.escHtml(code)}</span>
+                    </div>`;
+                }).join("");
+
+                results.querySelectorAll(".mrs-ris-result-item").forEach(el =>
+                    el.addEventListener("click", () => _selectProject(el.dataset))
+                );
+
+            } catch (err) {
+                console.error("SearchProjects error:", err);
+                results.innerHTML = `<div class="mrs-ris-result-empty" style="color:#dc2626">
+                    Search failed.</div>`;
+            }
+        }
+
+        function _selectProject(dataset) {
+            _activeProjectCodeId = dataset.projectcodeid;
+
+            document.getElementById("mrs-project-code-name").value        = dataset.projectcodeid;
+            document.getElementById("mrs-project-code-name-search").value =
+                `${dataset.projectcode} — ${dataset.projectname}`;
+            document.getElementById("mrs-project-code-name-results").classList.remove("open");
+
+            // Selecting a project narrows the RIS pool; clear any previously chosen RIS
+            _selectedRIS = null;
+            document.getElementById("mrs-ris-search").value = "";
+            document.getElementById("tm-mrs-ris").value = "";
+            document.getElementById("mrs-selected-ris-badge").style.display = "none";
+            document.getElementById("mrs-create-qty").value = "";
+            document.getElementById("mrs-create-qty").disabled = true;
+            document.getElementById("mrs-create-qty-hint").style.display = "none";
+            document.getElementById("mrs-create-qty-warn").style.display = "none";
+            document.getElementById("mrs-create-submit-btn").disabled = true;
+            document.getElementById("mrs-create-subtitle").textContent =
+                "Select an approved RIS to return against";
+
+            _searchRIS(); // re-query, now scoped to this project
+        }
+
+        // ── RIS live search ────────────────────────────────────────────────────
+        // Endpoint: GET /MRSMgmt/SearchRIS?searchRISNo={text}&searchProjectCodeId={id}
+        // Per requirement: typing in the RIS box always searches ALL RIS; the
+        // project filter (if active) narrows the pool, it does not restrict typed text.
+        async function _searchRIS() {
+            const q       = document.getElementById("mrs-ris-search").value.trim();
+            const results = document.getElementById("mrs-ris-results");
+
+            results.classList.add("open");
+            results.innerHTML = `<div class="mrs-ris-result-empty">
+                <i class="fas fa-spinner fa-spin"></i> Searching…</div>`;
+
+            try {
+                const params = new URLSearchParams();
+                if (q) params.set("searchRISNo", q);
+                if (_activeProjectCodeId) params.set("searchProjectCodeId", _activeProjectCodeId);
+
+                const res  = await fetch(`/MRSMgmt/SearchRIS?${params.toString()}`);
+                if (!res.ok) throw new Error(`HTTP ${res.status}`);
+                const json = await res.json();
+                const list = json.data ?? [];
+
+                if (!list.length) {
+                    results.innerHTML = `<div class="mrs-ris-result-empty">No approved RIS found.</div>`;
+                    return;
+                }
+
+                results.innerHTML = list.map(r => {
+                    const risId          = r.risId          ?? r.RISId;
+                    const risNo          = r.risNo          ?? r.RISNo          ?? "—";
+                    const projectCodeId  = r.projectCodeId  ?? r.ProjectCodeId  ?? "";
+                    const projectCode    = r.projectCode    ?? r.ProjectCode    ?? "N/A";
+                    const projectName    = r.projectName    ?? r.ProjectName    ?? "N/A";
+                    const discipline     = r.disciplineName ?? r.DisciplineName ?? "—";
+                    const maxReturn      = r.qtyAvailableToReturn ?? r.QtyAvailableToReturn ?? 0;
+
+                    return `
+                    <div class="mrs-ris-result-item"
+                         data-risid="${risId}"
+                         data-risno="${H.escAttr(risNo)}"
+                         data-projectcodeid="${projectCodeId}"
+                         data-projectcode="${H.escAttr(projectCode)}"
+                         data-projectname="${H.escAttr(projectName)}"
+                         data-discipline="${H.escAttr(discipline)}"
+                         data-maxreturn="${maxReturn}">
+                        <span class="mrs-ris-result-no">${H.escHtml(risNo)}</span>
+                        <span class="mrs-ris-result-meta">
+                            ${H.escHtml(projectCode)} · ${H.escHtml(discipline)} ·
+                            <strong>${maxReturn} pcs available</strong>
+                        </span>
+                    </div>`;
+                }).join("");
+
+                results.querySelectorAll(".mrs-ris-result-item").forEach(el =>
+                    el.addEventListener("click", () => _selectRIS(el.dataset))
+                );
+
+            } catch (err) {
+                console.error("SearchRIS error:", err);
+                results.innerHTML = `<div class="mrs-ris-result-empty" style="color:#dc2626">
+                    Search failed.</div>`;
+            }
+        }
+
+        function _selectRIS(dataset) {
+            _selectedRIS = {
+                risId:      parseInt(dataset.risid, 10),
+                risNo:      dataset.risno,
+                discipline: dataset.discipline,
+                maxReturn:  parseInt(dataset.maxreturn, 10)
+            };
+
+            document.getElementById("tm-mrs-ris").value              = _selectedRIS.risId;
+            document.getElementById("mrs-ris-search").value          = _selectedRIS.risNo;
+            document.getElementById("mrs-ris-results").classList.remove("open");
+
+            // Backfill project box for clarity if RIS picked without a project pre-selected
+            if (!_activeProjectCodeId && dataset.projectcodeid) {
+                document.getElementById("mrs-project-code-name").value        = dataset.projectcodeid;
+                document.getElementById("mrs-project-code-name-search").value =
+                    `${dataset.projectcode} — ${dataset.projectname}`;
+            }
+
+            // Populate badge
+            document.getElementById("mrs-sel-risno").textContent      = _selectedRIS.risNo;
+            document.getElementById("mrs-sel-maxreturn").textContent  = _selectedRIS.maxReturn + " pcs";
+            document.getElementById("mrs-sel-project").textContent    =
+                `${dataset.projectcode} — ${dataset.projectname}`;
+            document.getElementById("mrs-sel-discipline").textContent = _selectedRIS.discipline;
+
+            const badge = document.getElementById("mrs-selected-ris-badge");
+            badge.style.display = "flex";
+
+            const qtyEl = document.getElementById("mrs-create-qty");
+            qtyEl.disabled = false;
+            qtyEl.max      = _selectedRIS.maxReturn;
+            qtyEl.value    = "";
+            qtyEl.focus();
+
+            const hint = document.getElementById("mrs-create-qty-hint");
+            hint.style.display = "block";
+            hint.textContent   = `Max returnable: ${_selectedRIS.maxReturn} pcs`;
+
+            document.getElementById("mrs-create-submit-btn").disabled = false;
+            document.getElementById("mrs-create-subtitle").textContent = _selectedRIS.risNo;
+        }
+
+        function _validateCreateQty() {
+            const val  = parseInt(document.getElementById("mrs-create-qty").value, 10);
+            const max  = _selectedRIS?.maxReturn ?? 0;
+            const warn = document.getElementById("mrs-create-qty-warn");
+            const txt  = document.getElementById("mrs-create-qty-warn-text");
+            const el   = document.getElementById("mrs-create-qty");
+
+            const over = !isNaN(val) && val > max;
+            const zero = !isNaN(val) && val < 1;
+
+            txt.textContent = over ? `Cannot exceed ${max} available.`
+                            : zero ? "Must be at least 1." : "";
+            warn.style.display = (over || zero) ? "flex" : "none";
+            el.classList.toggle("error", over || zero);
+        }
+
+        async function _handleCreateSubmit() {
+            if (!_selectedRIS) {
+                showToast("warning", "Please select a RIS reference.", "Required", 3000);
+                return;
+            }
+
+            const qty        = parseInt(document.getElementById("mrs-create-qty").value, 10);
+            const returnedBy = document.getElementById("mrs-create-returnedby").value.trim();
+            const condition  = document.getElementById("mrs-create-condition").value;
+            const remarks    = document.getElementById("mrs-create-remarks").value.trim();
+
+            let valid = true;
+            if (isNaN(qty) || qty < 1 || qty > _selectedRIS.maxReturn) {
+                document.getElementById("mrs-create-qty").classList.add("error");
+                valid = false;
+            }
+            if (!returnedBy) {
+                document.getElementById("mrs-create-returnedby").classList.add("error");
+                valid = false;
+            }
+            if (!valid) {
+                showToast("warning", "Please fix the highlighted fields.", "Validation", 3000);
+                return;
+            }
+
+            const btn = document.getElementById("mrs-create-submit-btn");
+            btn.disabled = true;
+            btn.querySelector("i").className = "fas fa-spinner fa-spin";
+
+            try {
+                const res  = await fetch("/MRSMgmt/CreateMRS", {
                     method:  "POST",
                     headers: { "Content-Type": "application/json" },
-                    body:    JSON.stringify({ mrsId, reason })
+                    body:    JSON.stringify({
+                        RISId:       _selectedRIS.risId,
+                        QtyReturned: qty,
+                        ReturnedBy:  returnedBy,
+                        Condition:   condition,
+                        Remarks:     remarks || null
+                    })
                 });
+
                 const json = await res.json();
                 const d    = json.data ?? json;
 
                 if (!res.ok || !d.success) {
-                    showToast("error", d.message ?? "Could not cancel MRS.", "Failed", 4000);
+                    showToast("error", d.message ?? "Could not create MRS.", "Failed", 4000);
                     return;
                 }
-                showToast("success", d.message ?? "MRS cancelled.", "Cancelled", 3500);
-                closeModal();
+
+                showToast("success", d.message ?? "MRS created successfully.", "Done!", 3500);
+                document.getElementById("mrs-create-overlay").style.display = "none";
+                document.removeEventListener("click", _onOutsideClickForSearchPanels);
                 fetchData();
+
             } catch (err) {
-                console.error("CancelMRS error:", err);
-                showToast("error", "Request failed.", "Error", 4000);
+                console.error("CreateMRS error:", err);
+                showToast("error", "Request failed. Please try again.", "Error", 4000);
             } finally {
-                newConfirm.disabled = false;
-                newConfirm.innerHTML = `<i class="fas fa-ban"></i> Cancel MRS`;
+                if (document.getElementById("mrs-create-overlay").style.display !== "none") {
+                    btn.disabled = false;
+                    btn.querySelector("i").className = "fas fa-file-import";
+                }
             }
-        });
-    }
+        }
 
-    // ══════════════════════════════════════════════════════════════════════
-    //  CREATE FAB — inject above the filter bar
-    // ══════════════════════════════════════════════════════════════════════
-    (function injectCreateButton() {
-        const filterBar = document.querySelector(".inv-filters");
-        if (!filterBar) return;
+        // ══════════════════════════════════════════════════════════════════════
+        //  APPROVE MRS MODAL
+        // ══════════════════════════════════════════════════════════════════════
+        function openApproveModal(mrsId, dataset) {
+            const overlay = document.getElementById("mrs-approve-overlay");
 
-        const fab = document.createElement("button");
-        fab.className   = "mrs-create-fab";
-        fab.innerHTML   = `<i class="fas fa-plus"></i> New Material Return Slip`;
-        fab.addEventListener("click", openCreateModal);
-        filterBar.parentNode.insertBefore(fab, filterBar);
+            document.getElementById("mrs-approve-subtitle").textContent =
+                `${dataset.mrsno} — ${dataset.itemname ?? ""}`;
+
+            document.getElementById("mrs-approve-detail").innerHTML = `
+                <div class="am-field">
+                    <span class="am-lbl"><i class="fas fa-hashtag"></i> MRS No</span>
+                    <span class="am-val">${H.escHtml(dataset.mrsno)}</span>
+                </div>
+                <div class="am-field">
+                    <span class="am-lbl"><i class="fas fa-undo"></i> Qty Returned</span>
+                    <span class="am-val">${dataset.qtyreturned ?? 0} pcs</span>
+                </div>
+                <div class="am-field">
+                    <span class="am-lbl"><i class="fas fa-box"></i> Item</span>
+                    <span class="am-val">${H.escHtml(dataset.itemname ?? "—")}</span>
+                </div>
+                <div class="am-field">
+                    <span class="am-lbl"><i class="fas fa-user"></i> Returned By</span>
+                    <span class="am-val">${H.escHtml(dataset.returnedby ?? "—")}</span>
+                </div>
+                <div class="am-field">
+                    <span class="am-lbl"><i class="fas fa-tag"></i> Condition</span>
+                    <span class="am-val">${H.escHtml(dataset.condition ?? "—")}</span>
+                </div>`;
+
+            overlay.style.display = "flex";
+
+            const closeModal  = () => { overlay.style.display = "none"; };
+            const confirmBtn  = document.getElementById("mrs-approve-confirm-btn");
+            const cancelBtn   = document.getElementById("mrs-approve-cancel-btn");
+            const newConfirm  = confirmBtn.cloneNode(true);
+            const newCancel   = cancelBtn.cloneNode(true);
+            confirmBtn.replaceWith(newConfirm);
+            cancelBtn.replaceWith(newCancel);
+
+            newCancel.addEventListener("click", closeModal);
+            overlay.addEventListener("click", e => { if (e.target === overlay) closeModal(); });
+
+            newConfirm.addEventListener("click", async () => {
+                newConfirm.disabled = true;
+                newConfirm.innerHTML = `<i class="fas fa-spinner fa-spin"></i> Approving…`;
+                try {
+                    const res  = await fetch("/MRSMgmt/ApproveMRS", {
+                        method:  "POST",
+                        headers: { "Content-Type": "application/json" },
+                        body:    JSON.stringify({ mrsId })
+                    });
+                    const json = await res.json();
+                    const d    = json.data ?? json;
+
+                    if (!res.ok || !d.success) {
+                        showToast("error", d.message ?? "Could not approve MRS.", "Failed", 4000);
+                        return;
+                    }
+                    showToast("success", d.message ?? "MRS approved.", "Approved!", 3500);
+                    closeModal();
+                    fetchData();
+                } catch (err) {
+                    console.error("ApproveMRS error:", err);
+                    showToast("error", "Request failed.", "Error", 4000);
+                } finally {
+                    newConfirm.disabled = false;
+                    newConfirm.innerHTML = `<i class="fas fa-check"></i> Approve MRS`;
+                }
+            });
+        }
+
+        // ══════════════════════════════════════════════════════════════════════
+        //  CANCEL MRS MODAL
+        // ══════════════════════════════════════════════════════════════════════
+        function openCancelModal(mrsId, dataset) {
+            const overlay  = document.getElementById("mrs-cancel-overlay");
+            const reasonEl = document.getElementById("mrs-cancel-reason");
+            reasonEl.value = "";
+            reasonEl.classList.remove("error");
+
+            document.getElementById("mrs-cancel-subtitle").textContent =
+                `${dataset.mrsno} — ${dataset.itemname ?? ""}`;
+
+            document.getElementById("mrs-cancel-detail").innerHTML = `
+                <div class="am-field">
+                    <span class="am-lbl"><i class="fas fa-hashtag"></i> MRS No</span>
+                    <span class="am-val" style="color:#991b1b">
+                        ${H.escHtml(dataset.mrsno)}
+                    </span>
+                </div>
+                <div class="am-field">
+                    <span class="am-lbl"><i class="fas fa-undo"></i> Qty Returned</span>
+                    <span class="am-val" style="color:#991b1b">
+                        ${dataset.qtyreturned ?? 0} pcs
+                    </span>
+                </div>
+                <div class="am-field">
+                    <span class="am-lbl"><i class="fas fa-box"></i> Item</span>
+                    <span class="am-val">${H.escHtml(dataset.itemname ?? "—")}</span>
+                </div>
+                <div class="am-field">
+                    <span class="am-lbl"><i class="fas fa-user"></i> Returned By</span>
+                    <span class="am-val">${H.escHtml(dataset.returnedby ?? "—")}</span>
+                </div>`;
+
+            overlay.style.display = "flex";
+
+            const closeModal = () => { overlay.style.display = "none"; };
+            const confirmBtn = document.getElementById("mrs-cancel-confirm-btn");
+            const dismissBtn = document.getElementById("mrs-cancel-dismiss-btn");
+            const newConfirm = confirmBtn.cloneNode(true);
+            const newDismiss = dismissBtn.cloneNode(true);
+            confirmBtn.replaceWith(newConfirm);
+            dismissBtn.replaceWith(newDismiss);
+
+            newDismiss.addEventListener("click", closeModal);
+            overlay.addEventListener("click", e => { if (e.target === overlay) closeModal(); });
+
+            newConfirm.addEventListener("click", async () => {
+                const reason = reasonEl.value.trim();
+                if (!reason) {
+                    reasonEl.classList.add("error");
+                    reasonEl.focus();
+                    showToast("warning", "Please enter a reason for cancellation.", "Required", 3000);
+                    return;
+                }
+
+                newConfirm.disabled = true;
+                newConfirm.innerHTML = `<i class="fas fa-spinner fa-spin"></i> Cancelling…`;
+
+                try {
+                    const res  = await fetch("/MRSMgmt/CancelMRS", {
+                        method:  "POST",
+                        headers: { "Content-Type": "application/json" },
+                        body:    JSON.stringify({ mrsId, reason })
+                    });
+                    const json = await res.json();
+                    const d    = json.data ?? json;
+
+                    if (!res.ok || !d.success) {
+                        showToast("error", d.message ?? "Could not cancel MRS.", "Failed", 4000);
+                        return;
+                    }
+                    showToast("success", d.message ?? "MRS cancelled.", "Cancelled", 3500);
+                    closeModal();
+                    fetchData();
+                } catch (err) {
+                    console.error("CancelMRS error:", err);
+                    showToast("error", "Request failed.", "Error", 4000);
+                } finally {
+                    newConfirm.disabled = false;
+                    newConfirm.innerHTML = `<i class="fas fa-ban"></i> Cancel MRS`;
+                }
+            });
+        }
+
+        // ══════════════════════════════════════════════════════════════════════
+        //  CREATE FAB — inject above the filter bar
+        // ══════════════════════════════════════════════════════════════════════
+        (function injectCreateButton() {
+            const filterBar = document.querySelector(".inv-filters");
+            if (!filterBar) return;
+
+            const fab = document.createElement("button");
+            fab.className   = "mrs-create-fab";
+            fab.innerHTML   = `<i class="fas fa-plus"></i> New Material Return Slip`;
+            fab.addEventListener("click", openCreateModal);
+            filterBar.parentNode.insertBefore(fab, filterBar);
+        })();
+
+        // ══════════════════════════════════════════════════════════════════════
+        //  HELPERS
+        // ══════════════════════════════════════════════════════════════════════
+        function _statusLabel(code) {
+            return { 0: "Draft", 1: "Approved", 2: "Cancelled" }[code] ?? "Unknown";
+        }
+
+        function _formatDate(raw) {
+            if (!raw) return "—";
+            const d = new Date(raw);
+            return isNaN(d) ? raw : d.toLocaleDateString("en-US", {
+                month: "short", day: "numeric", year: "numeric"
+            });
+        }
+
+        // ── Initial load ───────────────────────────────────────────────────────
+        fetchData();
     })();
-
-    // ══════════════════════════════════════════════════════════════════════
-    //  HELPERS
-    // ══════════════════════════════════════════════════════════════════════
-    function _statusLabel(code) {
-        return { 0: "Draft", 1: "Approved", 2: "Cancelled" }[code] ?? "Unknown";
-    }
-
-    function _formatDate(raw) {
-        if (!raw) return "—";
-        const d = new Date(raw);
-        return isNaN(d) ? raw : d.toLocaleDateString("en-US", {
-            month: "short", day: "numeric", year: "numeric"
-        });
-    }
-
-    // ── Initial load ───────────────────────────────────────────────────────
-    fetchData();
-})();
 </script>
diff --git a/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/RIS.cshtml b/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/RIS.cshtml
index 54b668a..cdb7878 100644
--- a/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/RIS.cshtml
+++ b/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/RIS.cshtml
@@ -10,7 +10,7 @@
     </div>
     <div class="inv-search-box">
         <i class="fas fa-user"></i>
-        <input type="text" id="ris-srchIssuedTo" placeholder="Issued To..." />
+        <input type="text" id="ris-srchIssuedTo" placeholder="Project Name..." />
     </div>
 
     @* ── Discipline dropdown ── *@
@@ -18,18 +18,18 @@
         <div class="inv-dep-trigger">
             <span class="inv-dep-left">
                 <i class="fas fa-tools"></i>
-                <span class="inv-dep-lbl">All Disciplines</span>
+                <span class="inv-dep-lbl">All Trades</span>
             </span>
             <i class="fas fa-chevron-down inv-dep-caret"></i>
         </div>
         <div class="inv-dep-dropdown">
             <div class="inv-dep-searchbox">
                 <i class="fas fa-search"></i>
-                <input type="text" placeholder="Search discipline..." autocomplete="off" />
+                <input type="text" placeholder="Search trades..." autocomplete="off" />
             </div>
             <div class="inv-dep-list">
                 <div class="inv-dep-opt active" data-value="">
-                    <i class="fas fa-th-large"></i> All Disciplines
+                    <i class="fas fa-th-large"></i> All Trades
                 </div>
             </div>
         </div>
@@ -505,7 +505,7 @@
         fetchData();
     }, {
         cssPrefix: "inv-dep",
-        allLabel:  "All Disciplines",
+        allLabel:  "All Trades",
         allIcon:   "fas fa-th-large",
         itemIcon:  "fas fa-tools"
     });
@@ -642,7 +642,7 @@
         const risNo        = item.risNo        ?? item.RISNo        ?? "—";
         const itemName     = item.itemName     ?? item.ItemName     ?? "—";
         const itemNo       = item.itemNo       ?? item.ItemNo       ?? "—";
-        const issuedTo     = item.issuedTo     ?? item.IssuedTo     ?? "—";
+        const issuedTo     = item.projectCode     ?? item.projectName     ?? "—";
         const discipline   = item.disciplineName ?? item.DisciplineName ?? "—";
         const qtyIssued    = item.qtyIssued    ?? item.QtyIssued    ?? 0;
         const totalReturned= item.totalReturned ?? item.TotalReturned ?? 0;
@@ -713,7 +713,7 @@
             <div class="ris-card-body">
                 <div class="ris-field-row">
                     <span class="ris-field-lbl">
-                        <i class="fas fa-tools"></i> Discipline
+                        <i class="fas fa-tools"></i> Trade
                     </span>
                     <span class="ris-field-val">
                         <span class="ris-discipline-chip">
diff --git a/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/Reports/InventorySummaryReportFinance.cshtml b/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/Reports/InventorySummaryReportFinance.cshtml
new file mode 100644
index 0000000..b0201e6
--- /dev/null
+++ b/CPRNIMS.WebApps/Views/Components/Inventory/TabPage/Reports/InventorySummaryReportFinance.cshtml
@@ -0,0 +1,726 @@
+<style>
+    body {
+        font-family: 'DM Sans', Arial, sans-serif;
+        background: #fff;
+        color: #1a2e35;
+        padding: 24px;
+    }
+    @@media print {
+        body { padding: 0; margin: 0; background: #fff;}
+        body * { visibility: hidden;}
+
+    #inv-rpt-page, #inv-rpt-page * {
+        visibility: visible;
+    }
+
+    #inv-rpt-page {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        box-shadow: none !important;
+        border: none !important;
+        border-radius: 0 !important;
+    }
+
+    .no-print {
+        display: none !important;
+    }
+
+    .rpt-table tr {
+        page-break-inside: avoid;
+    }
+
+    thead {
+        display: table-header-group;
+    }
+
+    }
+
+    .rpt-page {
+        width: 100%;
+        margin: 0;
+        background: #fff;
+        border: 1px solid var(--border, #d6eaec);
+        border-radius: var(--radius-lg, 14px);
+        overflow: hidden;
+    }
+    .rpt-header {
+        padding: 20px 24px 16px;
+        border-bottom: 1px solid #d6eaec;
+    }
+    /* ── FILTER BUTTONS (blended with shared theme) ── */
+    .rpt-date-group {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        border: 1.5px solid var(--border, #d6eaec);
+        border-radius: var(--radius-sm, 8px);
+        padding: 0 12px;
+        background: #fff;
+    }
+
+    .rpt-date-lbl {
+        display: flex;
+        align-items: center;
+        gap: 6px;
+        font-size: .8rem;
+        font-weight: 600;
+        color: var(--text-muted, #6b8890);
+        white-space: nowrap;
+    }
+
+    .rpt-date-input {
+        border: none;
+        outline: none;
+        background: transparent;
+        padding: 9px 0;
+        font-family: 'DM Sans', sans-serif;
+        font-size: .875rem;
+        color: var(--text-dark, #1a2e35);
+    }
+
+    .rpt-btn {
+        display: inline-flex;
+        align-items: center;
+        gap: 7px;
+        padding: 9px 18px;
+        border-radius: var(--radius-sm, 8px);
+        border: none;
+        font-family: 'DM Sans', sans-serif;
+        font-size: .84rem;
+        font-weight: 600;
+        cursor: pointer;
+        transition: all .2s ease;
+        white-space: nowrap;
+    }
+
+    .rpt-btn-primary {
+        background: var(--teal-mid, #0e7c86);
+        color: #fff;
+        box-shadow: 0 2px 8px rgba(14,124,134,.3);
+    }
+
+        .rpt-btn-primary:hover {
+            background: var(--teal-dark, #0d5c63);
+            transform: translateY(-1px);
+            box-shadow: 0 4px 14px rgba(14,124,134,.35);
+        }
+
+    .rpt-btn-outline {
+        background: #fff;
+        color: var(--teal-dark, #0d5c63);
+        border: 1.5px solid var(--teal-mid, #0e7c86);
+    }
+
+        .rpt-btn-outline:hover {
+            background: var(--teal-pale, #e6f7f8);
+            border-color: var(--teal-dark, #0d5c63);
+        }
+    .rpt-header-top {
+        display: flex;
+        align-items: flex-start;
+        justify-content: space-between;
+        margin-bottom: 14px;
+    }
+
+    .rpt-company {
+        font-size: 11px;
+        font-weight: 600;
+        color: #6b8890;
+        text-transform: uppercase;
+        letter-spacing: .08em;
+        margin-bottom: 4px;
+    }
+
+    .rpt-title {
+        font-size: 20px;
+        font-weight: 700;
+        color: #1a2e35;
+        margin-bottom: 2px;
+    }
+
+    .rpt-subtitle {
+        font-size: 12px;
+        color: #6b8890;
+    }
+
+    .rpt-logo {
+        width: 40px;
+        height: 40px;
+        border-radius: 8px;
+        background: #EAF3DE;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+        .rpt-logo i {
+            font-size: 20px;
+            color: #3B6D11;
+        }
+
+    .rpt-meta {
+        display: flex;
+        gap: 24px;
+        flex-wrap: wrap;
+    }
+
+    .rpt-meta-item {
+        display: flex;
+        flex-direction: column;
+        gap: 2px;
+    }
+
+    .rpt-meta-lbl {
+        font-size: 10px;
+        font-weight: 600;
+        color: #6b8890;
+        text-transform: uppercase;
+        letter-spacing: .07em;
+    }
+
+    .rpt-meta-val {
+        font-size: 12px;
+        font-weight: 600;
+        color: #1a2e35;
+    }
+
+    .kpi-strip {
+        display: grid;
+        grid-template-columns: repeat(4, 1fr);
+        gap: 0;
+        border-bottom: 1px solid #d6eaec;
+    }
+
+    .kpi-cell {
+        padding: 14px 18px;
+        border-right: 1px solid #d6eaec;
+    }
+
+        .kpi-cell:last-child {
+            border-right: none;
+        }
+
+    .kpi-lbl {
+        font-size: 10px;
+        font-weight: 600;
+        color: #6b8890;
+        text-transform: uppercase;
+        letter-spacing: .07em;
+        margin-bottom: 4px;
+    }
+
+    .kpi-val {
+        font-size: 22px;
+        font-weight: 700;
+        color: #1a2e35;
+    }
+
+    .rpt-section {
+        padding: 16px 24px;
+    }
+
+        .rpt-section + .rpt-section {
+            border-top: 1px solid #d6eaec;
+        }
+
+    .rpt-section-title {
+        font-size: 11px;
+        font-weight: 600;
+        color: #6b8890;
+        text-transform: uppercase;
+        letter-spacing: .08em;
+        margin-bottom: 12px;
+    }
+
+    .rpt-table {
+        width: 100%;
+        border-collapse: collapse;
+        font-size: 12px;
+    }
+
+        .rpt-table thead tr {
+            background: linear-gradient(135deg, #1a3a4a, #1e5468);
+        }
+
+        .rpt-table th {
+            text-align: left;
+            font-size: 10px;
+            font-weight: 700;
+            color: rgba(255,255,255,.85);
+            text-transform: uppercase;
+            letter-spacing: .06em;
+            padding: 9px 12px;
+            white-space: nowrap;
+        }
+
+        .rpt-table td {
+            padding: 9px 12px;
+            border-bottom: 1px solid #d6eaec;
+            vertical-align: middle;
+        }
+
+        .rpt-table tr:last-child td {
+            border-bottom: none;
+        }
+
+        .rpt-table .num {
+            text-align: right;
+        }
+
+        .rpt-table .total-row td {
+            font-weight: 700;
+            background: #f0f6f7;
+        }
+
+    .pill {
+        display: inline-flex;
+        align-items: center;
+        gap: 4px;
+        padding: 2px 9px;
+        border-radius: 50px;
+        font-size: 10px;
+        font-weight: 600;
+    }
+
+    .mini-bar-track {
+        flex: 1;
+        height: 5px;
+        border-radius: 3px;
+        background: #d6eaec;
+        overflow: hidden;
+    }
+
+    .mini-bar-fill {
+        height: 100%;
+        border-radius: 3px;
+    }
+
+    .fill-teal {
+        background: #1D9E75;
+    }
+
+    .fill-blue {
+        background: #378ADD;
+    }
+
+    .fill-amber {
+        background: #EF9F27;
+    }
+
+    .fill-coral {
+        background: #D85A30;
+    }
+
+    .two-col {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        gap: 0;
+        border-top: 1px solid #d6eaec;
+    }
+
+    .col-left {
+        padding: 16px 24px;
+        border-right: 1px solid #d6eaec;
+    }
+
+    .col-right {
+        padding: 16px 24px;
+    }
+
+    .sig-block {
+        display: grid;
+        grid-template-columns: repeat(3, 1fr);
+        gap: 16px;
+    }
+
+    .sig-item {
+        border-top: 1px solid #d6eaec;
+        padding-top: 8px;
+    }
+
+    .sig-role {
+        font-size: 10px;
+        color: #6b8890;
+        text-transform: uppercase;
+        letter-spacing: .07em;
+        margin-bottom: 16px;
+    }
+
+    .sig-name {
+        font-size: 11px;
+        font-weight: 600;
+        color: #1a2e35;
+    }
+
+    .rpt-footer {
+        padding: 10px 24px;
+        border-top: 1px solid #d6eaec;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        background: #f0f6f7;
+    }
+
+    .rpt-footer-lbl {
+        font-size: 10px;
+        color: #6b8890;
+    }
+
+    .loading-state {
+        text-align: center;
+        padding: 80px 20px;
+        color: #6b8890;
+    }
+</style>
+@await Html.PartialAsync("PagesView/Inventory/_InventoryReportHelper")
+
+<script>
+    (function () {
+        "use strict";
+
+        const fromEl  = document.getElementById("inv-rpt-from");
+        const toEl     = document.getElementById("inv-rpt-to");
+        const genBtn   = document.getElementById("inv-rpt-generate");
+        const csvBtn   = document.getElementById("inv-rpt-csv");
+        const xlsxBtn  = document.getElementById("inv-rpt-excel");
+        const container = document.getElementById("inv-rpt-container");
+
+        if (!fromEl || !toEl || !container) {
+            console.error("Inventory report subtab init failed — missing elements.");
+            return;
+        }
+
+        // default: first day of current month -> today
+        const today = new Date();
+        const first = new Date(today.getFullYear(), today.getMonth(), 1);
+        toEl.value   = today.toISOString().slice(0, 10);
+        fromEl.value = first.toISOString().slice(0, 10);
+
+        let lastData = null; // cache for export
+
+        function buildParams() {
+            return new URLSearchParams({ dateFrom: fromEl.value, dateTo: toEl.value });
+        }
+
+        csvBtn.addEventListener("click", exportCsv);
+        genBtn.addEventListener("click", fetchAndRender);
+
+        async function fetchAndRender() {
+            container.innerHTML = `<div class="inv-tab-loading">
+                <div class="inv-spinner"></div><span>Loading report…</span></div>`;
+
+            try {
+                const res  = await fetch(`/InventoryReports/GetInventoryReport?${buildParams()}`);
+                if (!res.ok) throw new Error(`HTTP ${res.status}`);
+                const json = await res.json();
+                lastData   = json.data ?? json;
+                renderReport(lastData);
+            } catch (err) {
+                console.error("Inventory report fetch error:", err);
+                container.innerHTML = `
+                    <div class="inv-placeholder">
+                        <i class="fas fa-exclamation-triangle" style="color:#ff5c5c"></i>
+                        <h3>Failed to load report</h3>
+                        <p>Please try again.</p>
+                    </div>`;
+            }
+        }
+
+        // ── CSV export (client-side, no backend needed) ──
+           function exportCsv() {
+        if (!lastData) return;
+        const rows   = lastData.rows ?? [];
+        const byCat  = lastData.byCategory ?? [];
+        const alerts = lastData.alerts ?? [];
+        const summary = lastData.summary ?? {};
+        const headers = ["Item Name","Item No.","Category","Unit Price","Qty In","Qty Out","On Hand","Stock %"];
+
+        const csvLines = [
+            `Inventory Summary Report`,
+            `Company,${csvCell(lastData.companyName)}`,
+            `Report No,${csvCell(lastData.reportNo)}`,
+            `Period,${csvCell(fromEl.value)} to ${csvCell(toEl.value)}`,
+            ``,
+            // ── Inventory detail ──
+            headers.map(csvCell).join(","),
+            ...rows.map(r => [
+                r.itemName, r.itemNo, r.itemCategoryName, r.unitPrice,
+                r.qtyIn, r.qtyOut, r.qtyOnHand, r.stockPct
+            ].map(csvCell).join(",")),
+            ["Total","","","", summary.totalQtyIn ?? 0, summary.totalQtyOut ?? 0, summary.totalOnHand ?? 0, ""].map(csvCell).join(","),
+            ``,
+            // ── Stock level by category ──
+            `Stock Level by Category`,
+            ["Category","Avg Stock %"].map(csvCell).join(","),
+            ...byCat.map(c => [c.categoryName, c.avgStockPct].map(csvCell).join(",")),
+            ``,
+            // ── Items requiring attention ──
+            `Items Requiring Attention`,
+            ["Item","On Hand","Alert"].map(csvCell).join(","),
+            ...alerts.map(a => [a.itemName, a.qtyOnHand, a.severity].map(csvCell).join(","))
+        ];
+
+        downloadBlob(
+            "\uFEFF" + csvLines.join("\r\n"),
+            `Inventory_Report_${fromEl.value}_to_${toEl.value}.csv`,
+            "text/csv;charset=utf-8;"
+        );
+    }
+        function csvCell(v) {
+            const s = String(v ?? "");
+            return /[",\r\n]/.test(s) ? `"${s.replace(/"/g, '""')}"` : s;
+        }
+        function downloadBlob(content, filename, mime) {
+            const blob = new Blob([content], { type: mime });
+            const url  = URL.createObjectURL(blob);
+            const a    = document.createElement("a");
+            a.href = url; a.download = filename;
+            document.body.appendChild(a); a.click();
+            document.body.removeChild(a);
+            URL.revokeObjectURL(url);
+        }
+
+        function renderReport(data) {
+            const summary  = data.summary ?? {};
+            const rows     = data.rows ?? [];
+            const byCat    = data.byCategory ?? [];
+            const alerts   = data.alerts ?? [];
+
+            const catFillColors = ["fill-teal", "fill-blue", "fill-amber", "fill-coral"];
+            const maxCatPct = Math.max(1, ...byCat.map(c => c.avgStockPct));
+
+            container.innerHTML = `
+            <div class="rpt-page" id="inv-rpt-page">
+
+                <div class="rpt-header">
+                    <div class="rpt-header-top">
+                        <div>
+                            <div class="rpt-company">${_esc(data.companyName ?? "")}</div>
+                            <div class="rpt-title">Inventory summary Report</div>
+                            <div class="rpt-subtitle">As of ${_fmtDate(data.asOf)} · All departments · All categories</div>
+                        </div>
+                        <div class="rpt-logo" style="background:#EAF3DE">
+                            <i class="fas fa-boxes" style="color:#3B6D11"></i>
+                        </div>
+                    </div>
+                    <div class="rpt-meta">
+                        <div class="rpt-meta-item">
+                            <span class="rpt-meta-lbl">Prepared by</span>
+                            <span class="rpt-meta-val">${_esc(data.preparedBy ?? "Finance Department")}</span>
+                        </div>
+                        <div class="rpt-meta-item">
+                            <span class="rpt-meta-lbl">Print date</span>
+                            <span class="rpt-meta-val">${_fmtDate(new Date().toISOString())}</span>
+                        </div>
+                        <div class="rpt-meta-item">
+                            <span class="rpt-meta-lbl">Report no.</span>
+                            <span class="rpt-meta-val">${_esc(data.reportNo ?? "")}</span>
+                        </div>
+                    </div>
+                </div>
+
+                 <div class="kpi-strip" style="grid-template-columns:repeat(5,1fr)">
+                    <div class="kpi-cell">
+                        <div class="kpi-lbl"><i class="fas fa-box"></i> Total SKUs</div>
+                        <div class="kpi-val">${summary.totalSKUs ?? 0}</div>
+                    </div>
+                    <div class="kpi-cell">
+                        <div class="kpi-lbl"><i class="fas fa-layer-group"></i> Total on hand</div>
+                        <div class="kpi-val">${(summary.totalOnHand ?? 0).toLocaleString()}</div>
+                    </div>
+                    <div class="kpi-cell">
+                        <div class="kpi-lbl"><i class="fas fa-coins"></i> Total value</div>
+                        <div class="kpi-val">${_money(summary.totalValue ?? 0)}</div>
+                    </div>
+                    <div class="kpi-cell">
+                        <div class="kpi-lbl"><i class="fas fa-exclamation-triangle"></i> Low stock</div>
+                        <div class="kpi-val" style="color:#A32D2D">${summary.lowStockCount ?? 0}</div>
+                    </div>
+                    <div class="kpi-cell">
+                        <div class="kpi-lbl"><i class="fas fa-ban"></i> Out of stock</div>
+                        <div class="kpi-val" style="color:#A32D2D">${summary.outOfStockCount ?? 0}</div>
+                    </div>
+                </div>
+
+                <div class="rpt-section">
+                    <div class="rpt-section-title"><i class="fas fa-list"></i> Inventory detail by item</div>
+                      <table class="rpt-table">
+                        <thead>
+                            <tr>
+                                <th>Item Name</th><th>Item No.</th><th>Category</th>
+                                <th class="num">Unit Price</th>
+                                <th class="num">Qty In</th><th class="num">Qty Out</th>
+                                <th class="num">On Hand</th>
+                                <th class="num">Total Value</th>
+                                <th>Stock Level</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            ${rows.map(r => `
+                            <tr>
+                                <td style="font-weight:600">${_esc(r.itemName)}</td>
+                                <td style="color:var(--text-muted,#6b8890)">#${_esc(r.itemNo)}</td>
+                                <td>${_esc(r.itemCategoryName)}</td>
+                                <td class="num">${_money(r.unitPrice)}</td>
+                                <td class="num">${r.qtyIn}</td>
+                                <td class="num">${r.qtyOut}</td>
+                                <td class="num" style="font-weight:600">${r.qtyOnHand}</td>
+                                <td class="num">${_money(r.qtyOnHand * r.unitPrice)}</td>
+                                <td>${_stockBar(r.stockPct)}</td>
+                            </tr>`).join("")}
+                            <tr class="total-row">
+                                <td colspan="4">Total</td>
+                                <td class="num">${summary.totalQtyIn ?? 0}</td>
+                                <td class="num">${summary.totalQtyOut ?? 0}</td>
+                                <td class="num">${summary.totalOnHand ?? 0}</td>
+                                <td class="num">${_money(summary.totalValue ?? 0)}</td>
+                                <td></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+
+                <div class="two-col">
+                    <div class="col-left">
+                        <div class="rpt-section-title"><i class="fas fa-chart-bar"></i> Stock level by category</div>
+                        <div style="display:flex;flex-direction:column;gap:8px">
+                            ${byCat.map((c, i) => `
+                            <div>
+                                <div style="display:flex;justify-content:space-between;font-size:12px;margin-bottom:4px">
+                                    <span>${_esc(c.categoryName)}</span>
+                                    <span style="font-weight:600">${c.avgStockPct}% avg</span>
+                                </div>
+                                <div class="mini-bar-track">
+                                    <div class="mini-bar-fill ${catFillColors[i % catFillColors.length]}"
+                                         style="width:${c.avgStockPct}%"></div>
+                                </div>
+                            </div>`).join("")}
+                        </div>
+                    </div>
+                    <div class="col-right">
+                        <div class="rpt-section-title"><i class="fas fa-exclamation-triangle"></i> Items requiring attention</div>
+                        <table class="rpt-table">
+                            <thead><tr><th>Item</th><th class="num">On Hand</th><th>Alert</th></tr></thead>
+                            <tbody>
+                                ${alerts.map(a => `
+                                <tr>
+                                    <td>${_esc(a.itemName)}</td>
+                                    <td class="num" style="color:#A32D2D">${a.qtyOnHand}</td>
+                                    <td>${_alertPill(a.severity)}</td>
+                                </tr>`).join("")}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+
+                <div class="rpt-section">
+                    <div class="sig-block">
+                        <div class="sig-item"><div class="sig-role">Prepared by</div><div class="sig-name">Finance Officer</div></div>
+                        <div class="sig-item"><div class="sig-role">Reviewed by</div><div class="sig-name">Finance Manager</div></div>
+                        <div class="sig-item"><div class="sig-role">Approved by</div><div class="sig-name">Finance Director</div></div>
+                    </div>
+                </div>
+
+                <div class="rpt-footer">
+                    <span class="rpt-footer-lbl">${_esc(data.companyName ?? "")} — Confidential — For internal use only</span>
+                </div>
+            </div>`;
+        }
+        function _money(v) {
+            const n = Number(v) || 0;
+            return n.toLocaleString("en-PH", {
+                style: "currency",
+                currency: "PHP",
+                minimumFractionDigits: 2
+            });
+        }
+        function _stockBar(pct) {
+            const cls = pct < 20 ? "fill-coral" : pct < 50 ? "fill-amber" : "fill-teal";
+            const color = pct < 20 ? "#A32D2D" : pct < 50 ? "#854F0B" : "inherit";
+            return `<div style="display:flex;flex-direction:column;gap:3px">
+                <div class="mini-bar-track"><div class="mini-bar-fill ${cls}" style="width:${pct}%"></div></div>
+                <span style="font-size:10px;color:${color};text-align:right">${pct}%${pct < 20 ? " ⚠" : ""}</span>
+            </div>`;
+        }
+
+        function _alertPill(severity) {
+            const map = {
+                "Critical": { bg: "#FCEBEB", fg: "#A32D2D" },
+                "Low":      { bg: "#FAEEDA", fg: "#854F0B" }
+            };
+            const c = map[severity] ?? map["Low"];
+            return `<span class="pill" style="background:${c.bg};color:${c.fg}">${_esc(severity)}</span>`;
+        }
+
+            // ── Excel export (client-side, HTML-table .xls — Excel opens natively) ──
+        function exportExcel() {
+        if (!lastData) return;
+        const rows    = lastData.rows ?? [];
+        const byCat   = lastData.byCategory ?? [];
+        const alerts  = lastData.alerts ?? [];
+        const summary = lastData.summary ?? {};
+
+        const headerCells = ["Item Name","Item No.","Category","Unit Price","Qty In","Qty Out","On Hand","Stock %"]
+            .map(h => `<th>${_esc(h)}</th>`).join("");
+
+        const bodyRows = rows.map(r => `
+            <tr>
+                <td>${_esc(r.itemName)}</td>
+                <td>${_esc(r.itemNo)}</td>
+                <td>${_esc(r.itemCategoryName)}</td>
+                <td>${_esc(r.unitPrice)}</td>
+                <td>${r.qtyIn}</td>
+                <td>${r.qtyOut}</td>
+                <td>${r.qtyOnHand}</td>
+                <td>${r.stockPct}</td>
+            </tr>`).join("");
+
+        const catRows = byCat.map(c => `
+            <tr><td>${_esc(c.categoryName)}</td><td>${c.avgStockPct}</td></tr>`).join("");
+
+        const alertRows = alerts.map(a => `
+            <tr><td>${_esc(a.itemName)}</td><td>${a.qtyOnHand}</td><td>${_esc(a.severity)}</td></tr>`).join("");
+
+        const html = `
+            <html xmlns:o="urn:schemas-microsoft-com:office:office"
+                  xmlns:x="urn:schemas-microsoft-com:office:excel"
+                  xmlns="http://www.w3.org/TR/REC-html40">
+            <head><meta charset="utf-8"></head>
+            <body>
+                <table border="1">
+                    <tr><td colspan="8"><b>Inventory Summary Report</b></td></tr>
+                    <tr><td>Company</td><td colspan="7">${_esc(lastData.companyName)}</td></tr>
+                    <tr><td>Report No</td><td colspan="7">${_esc(lastData.reportNo)}</td></tr>
+                    <tr><td>Period</td><td colspan="7">${_esc(fromEl.value)} to ${_esc(toEl.value)}</td></tr>
+                    <tr></tr>
+                    <tr>${headerCells}</tr>
+                    ${bodyRows}
+                    <tr><td colspan="4"><b>Total</b></td><td>${summary.totalQtyIn ?? 0}</td><td>${summary.totalQtyOut ?? 0}</td><td>${summary.totalOnHand ?? 0}</td><td></td></tr>
+                </table>
+
+                <br/>
+                <table border="1">
+                    <tr><td colspan="2"><b>Stock Level by Category</b></td></tr>
+                    <tr><th>Category</th><th>Avg Stock %</th></tr>
+                    ${catRows}
+                </table>
+
+                <br/>
+                <table border="1">
+                    <tr><td colspan="3"><b>Items Requiring Attention</b></td></tr>
+                    <tr><th>Item</th><th>On Hand</th><th>Alert</th></tr>
+                    ${alertRows}
+                </table>
+            </body></html>`;
+
+        downloadBlob(html, `Inventory_Report_${fromEl.value}_to_${toEl.value}.xls`,
+            "application/vnd.ms-excel");
+    }
+
+    xlsxBtn.addEventListener("click", exportExcel);
+
+        fetchAndRender();
+    })();
+</script>
\ No newline at end of file
diff --git a/CPRNIMS.WebApps/Views/Components/POMgmt/CustomPO/DRElem.cshtml b/CPRNIMS.WebApps/Views/Components/POMgmt/CustomPO/DRElem.cshtml
index e2327de..03235d4 100644
--- a/CPRNIMS.WebApps/Views/Components/POMgmt/CustomPO/DRElem.cshtml
+++ b/CPRNIMS.WebApps/Views/Components/POMgmt/CustomPO/DRElem.cshtml
@@ -17,10 +17,11 @@
     <div class="col-6">
     <div class="row">
         <div class="col-3">
-            <div class="form-group">
-                <label for="currency">Currency</label>
-                <input disabled id="currency" value="PESO" class="form-control" />
-            </div>
+                <div class="form-group">
+                    <label for="currency">Currency</label>
+                    <input type="search" name="currency" id="currency" class="form-control" style="margin-bottom:5px;">
+                    <input type="hidden" id="currencyId" name="currencyId" />
+                </div>
         </div>
 
             <div class="col-3">
diff --git a/CPRNIMS.WebApps/Views/Components/POMgmt/CustomPO/ImportElem.cshtml b/CPRNIMS.WebApps/Views/Components/POMgmt/CustomPO/ImportElem.cshtml
index 6ba4805..ee81811 100644
--- a/CPRNIMS.WebApps/Views/Components/POMgmt/CustomPO/ImportElem.cshtml
+++ b/CPRNIMS.WebApps/Views/Components/POMgmt/CustomPO/ImportElem.cshtml
@@ -528,7 +528,8 @@
             <label class="lbl">Currency / CER</label>
             <div class="cur-pair">
                 <span class="cur-badge">USD</span>
-                <input type="hidden" id="currency" value="USD" />
+                <input type="search" name="currency" id="currency" class="form-control" style="margin-bottom:5px;">
+                <input type="hidden" id="currencyId" name="currencyId" />
                 <input type="number" id="currencyCER" name="currencyCER" value="59.00" class="fc" step="0.01">
             </div>
         </div>
@@ -672,4 +673,60 @@
     <!-- Hidden inputs -->
     <input hidden id="dr-ImportPoNo" />
     <input hidden id="si-ImportPoNo" />
-@await Html.PartialAsync("PagesView/PO/_DocRequired")
\ No newline at end of file
+@await Html.PartialAsync("PagesView/PO/_DocRequired")
+<script>
+       $(function() {
+        $("#currency").autocomplete({
+            source: function (request, response) {
+                console.log('Autocomplete source called with:', request.term);
+
+                $.ajax({
+                    url: endpoint.GetCurrencies,
+                    data: { query: request.term },
+                    success: function (result) {
+                        console.log('AJAX success:', result);
+
+                        if (result && result.success && Array.isArray(result.data)) {
+                            var formattedData = result.data.map(item => ({
+                                label: item.label || '',
+                                value: item.value !== undefined && item.value !== null ? item.value.toString() : '',
+                                value2: item.value2 !== undefined && item.value2 !== null ? item.value2.toString() : ''
+                            }));
+                            response(formattedData);
+                        } else {
+                            console.error('Invalid data format received:', result);
+                            response([]);
+                        }
+                    },
+                    error: function(xhr, status, error) {
+                        console.error('AJAX error:', status, error);
+                        console.log('Response:', xhr.responseText); 
+                        response([]);
+                    }
+                });
+            },
+            minLength: 2,
+            select: function (event, ui) {
+                $('#currency').val(ui.item.label);
+                $('#currencyId').val(ui.item.value);
+                return false;
+            },
+            focus: function (event, ui) {
+                event.preventDefault();
+            },
+            open: function () {
+                var dropdown = $(".ui-autocomplete");
+                dropdown.css({
+                    "max-height": "200px",
+                    "overflow-y": "auto"
+                });
+            },
+            messages: {
+                noResults: '',
+                results: function (count) {
+                    return count + (count > 1 ? ' results' : ' result');
+                }
+            }
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/CPRNIMS.WebApps/Views/Components/POMgmt/CustomPO/SIElem.cshtml b/CPRNIMS.WebApps/Views/Components/POMgmt/CustomPO/SIElem.cshtml
index 8f82a63..5f4586a 100644
--- a/CPRNIMS.WebApps/Views/Components/POMgmt/CustomPO/SIElem.cshtml
+++ b/CPRNIMS.WebApps/Views/Components/POMgmt/CustomPO/SIElem.cshtml
@@ -21,7 +21,8 @@
         <div class="col-3">
             <div class="form-group">
                 <label for="currency">Currency</label>
-                <input disabled id="currency" value="PESO" class="form-control" />
+                    <input type="search" name="currency" id="currency" class="form-control" style="margin-bottom:5px;">
+                    <input type="hidden" id="currencyId" name="currencyId" />
             </div>
         </div>
         <div class="col-3">
@@ -67,4 +68,4 @@
     <textarea id="remarks" class="form-control"
               style="width: 100%; height: 80px;margin-bottom:10px;"></textarea>
 </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/CPRNIMS.WebApps/Views/POMgmt/CustomPO.cshtml b/CPRNIMS.WebApps/Views/POMgmt/CustomPO.cshtml
index 039c0d0..7d2df4d 100644
--- a/CPRNIMS.WebApps/Views/POMgmt/CustomPO.cshtml
+++ b/CPRNIMS.WebApps/Views/POMgmt/CustomPO.cshtml
@@ -6,12 +6,12 @@
             </div>
             <div class="row" style="margin-bottom:10px">
             <!-- Left side (half of the row) -->
-                <div class="col-12 mb-2">
+            <div class="col-12 mb-2">
                     <div class="row align-items-end">
 
                         <!-- PO No -->
                         <div class="col-md-2">
-                            <div class="form-group">
+                 
                                 <label for="poNo">
                                     PO No.
                                     <i class="bx bx-pencil"
@@ -25,20 +25,20 @@
                                        id="poId"
                                        class="form-control"
                                        name="poId" />
-                            </div>
+                           
                         </div>
 
                         <!-- Final PO No -->
                         <div class="col-md-2">
-                            <div class="form-group">
+                       
                                 <label for="poNoFinal">Final PO No.</label>
                                 <input readonly id="poNoFinal" class="form-control">
-                            </div>
+                         
                         </div>
 
                         <!-- PO Type -->
                         <div class="col-md-2">
-                            <div class="form-group">
+                        
                                 <label for="poType">PO Type</label>
 
                                 <select class="form-control"
@@ -54,7 +54,7 @@
                                     <option value="2">DR</option>
                                     <option value="3">Import</option>
                                 </select>
-                            </div>
+                           
                         </div>
 
                         <!-- Supplier (Wider) -->
@@ -197,7 +197,7 @@
 
     <input hidden id="poTypeId"/>
     <link href="~/css/po/CustomPOV3.css" rel="stylesheet" />
-    <script src="~/JsFunctions/PO/CustomPOV9.js"></script>
+    <script src="~/JsFunctions/PO/CustomPO.js"></script>
     @await Html.PartialAsync("PagesView/PR/_PRWOCanvass")
     @await Html.PartialAsync("PagesView/PO/_POScripts")
 </body>
diff --git a/CPRNIMS.WebApps/Views/PRMgmt/ProjectCode.cshtml b/CPRNIMS.WebApps/Views/PRMgmt/ProjectCode.cshtml
index 4b8a9a7..761d9f9 100644
--- a/CPRNIMS.WebApps/Views/PRMgmt/ProjectCode.cshtml
+++ b/CPRNIMS.WebApps/Views/PRMgmt/ProjectCode.cshtml
@@ -17,7 +17,8 @@
                         <th style="width:25%">ProjectName</th>
                         <th style="width:32%">DeliveryAddress</th>
                         <th style="width:10%">MaxDays</th>
-                        <th style="width:11%">Status</th>
+                        <th style="width:11%">PorjectStatus</th>
+                        <th style="width:11%">Availability</th>
                         <th style="width:7%">Action</th>
                     </tr>
                 </thead>
@@ -63,7 +64,16 @@
                                       placeholder=" Describe deliveryAddress..."></textarea>
                             <label for="deliveryAddress">Delivery Address</label>
                         </div>
-
+                        <div class="form-floating mb-3">
+                            <select id="projectStatus" class="form-control">
+                                <option value="">-- Select Status --</option>
+                                <option value="Pending">Pending</option>
+                                <option value="Ongoing">Ongoing</option>
+                                <option value="Completed">Completed</option>
+                                <option value="Cancelled">Cancelled</option>
+                            </select>
+                            <label for="projectStatus">Project Status</label>
+                        </div>
                         <div class="row g-3 mb-3">
                             <div class="col-md-6">
                                 <div class="form-floating">
diff --git a/CPRNIMS.WebApps/Views/Shared/PagesView/Inventory/_InventoryTransactModal.cshtml b/CPRNIMS.WebApps/Views/Shared/PagesView/Inventory/_InventoryTransactModal.cshtml
index 4f9de85..057bb92 100644
--- a/CPRNIMS.WebApps/Views/Shared/PagesView/Inventory/_InventoryTransactModal.cshtml
+++ b/CPRNIMS.WebApps/Views/Shared/PagesView/Inventory/_InventoryTransactModal.cshtml
@@ -179,6 +179,46 @@
             opacity: .5;
             cursor: default;
         }
+
+    .tm-search-dropdown {
+        position: absolute;
+        top: 100%;
+        left: 0;
+        right: 0;
+        z-index: 1090;
+        margin-top: 4px;
+        max-height: 220px;
+        overflow-y: auto;
+        background: #fff;
+        border: 1.5px solid var(--border, #d6eaec);
+        border-radius: 8px;
+        box-shadow: 0 8px 24px rgba(0,0,0,.12);
+        display: none;
+    }
+
+        .tm-search-dropdown.open {
+            display: block;
+        }
+
+    .tm-search-item {
+        padding: 8px 10px;
+        font-size: 13px;
+        color: var(--text-dark, #1a2e35);
+        cursor: pointer;
+    }
+
+        .tm-search-item:hover,
+        .tm-search-item.active {
+            background: var(--teal-pale, #e6f7f8);
+            color: var(--teal-dark, #0d5c63);
+        }
+
+    .tm-search-empty {
+        padding: 10px;
+        font-size: 12px;
+        color: var(--text-muted, #6b8890);
+        text-align: center;
+    }
 </style>
  <script>
 window.TransactModal = (function () {
@@ -196,7 +236,7 @@ window.TransactModal = (function () {
     let optRIS, optMRS, formRIS, formMRS;
 
     // ── RIS fields ────────────────────────────────────────────────────────────
-    let risItemBadge, risOnHand, risDiscipline, risIssuedTo, risQty,
+    let risItemBadge, risOnHand, risDiscipline, risQty,
         risPRRef, risRemarks, risQtyWarn;
 
     // ── MRS fields ────────────────────────────────────────────────────────────
@@ -263,7 +303,7 @@ window.TransactModal = (function () {
                             <div style="width:38px;height:38px;border-radius:10px;
                                         background:rgba(255,255,255,.15);
                                         display:flex;align-items:center;justify-content:center">
-                                <i class="fas fa-transfer-alt" style="color:#fff;font-size:16px"></i>
+                                        <i class="fa-solid fa-arrow-right-arrow-left" style="color:#fff;font-size:16px"></i>
                             </div>
                             <div>
                                 <div style="font-size:14px;font-weight:600;color:#fff">
@@ -328,18 +368,20 @@ window.TransactModal = (function () {
                             <div style="display:grid;grid-template-columns:1fr 1fr;gap:10px">
                                 <div class="tm-form-group">
                                     <label class="tm-label">
-                                        <i class="fas fa-tools"></i> Discipline <span class="tm-req">*</span>
+                                        <i class="fas fa-tools"></i> TRADE <span class="tm-req">*</span>
                                     </label>
                                     <select id="tm-ris-discipline" class="tm-input">
-                                        <option value="">Select discipline…</option>
+                                        <option value="">Select trade…</option>
                                     </select>
                                 </div>
-                                <div class="tm-form-group">
+                                   <div class="tm-form-group" style="position:relative">
                                     <label class="tm-label">
-                                        <i class="fas fa-user"></i> Issued to <span class="tm-req">*</span>
+                                        <i class="fas fa-diagram-project"></i> Project Name <span class="tm-req">*</span>
                                     </label>
-                                    <input id="tm-ris-issuedto" class="tm-input"
-                                           type="text" placeholder="Name or user ID…">
+                                    <input id="tm-ris-project-code-name-search" class="tm-input"
+                                           type="text" placeholder="Search project name…" autocomplete="off">
+                                    <input type="hidden" id="tm-ris-project-code-name">
+                                    <div id="tm-ris-project-code-name-list" class="tm-search-dropdown"></div>
                                 </div>
                             </div>
                             <div style="display:grid;grid-template-columns:1fr 1fr;gap:10px">
@@ -359,7 +401,7 @@ window.TransactModal = (function () {
                                         <i class="fas fa-file-alt"></i> PR reference
                                     </label>
                                     <input id="tm-ris-prref" class="tm-input"
-                                           type="text" placeholder="PR-2026-XXXX">
+                                           type="text" readOnly placeholder="PR-2026-XXXX">
                                 </div>
                             </div>
                             <div class="tm-form-group">
@@ -454,7 +496,12 @@ window.TransactModal = (function () {
         // RIS fields
         risItemBadge  = document.getElementById("tm-ris-stock-badge");
         risDiscipline = document.getElementById("tm-ris-discipline");
-        risIssuedTo   = document.getElementById("tm-ris-issuedto");
+        risProjectCode       = document.getElementById("tm-ris-project-code-name");
+        risProjectCodeSearch = document.getElementById("tm-ris-project-code-name-search");
+        risProjectCodeList   = document.getElementById("tm-ris-project-code-name-list");
+
+        _bindProjectCodeSearch();
+
         risQty        = document.getElementById("tm-ris-qty");
         risPRRef      = document.getElementById("tm-ris-prref");
         risRemarks    = document.getElementById("tm-ris-remarks");
@@ -509,7 +556,7 @@ window.TransactModal = (function () {
 
         // Discipline dropdown
         risDiscipline.innerHTML = `
-            <option value="">Select discipline…</option>` +
+            <option value="">Select trade…</option>` +
                             (_ctx.disciplines || []).map(d =>
                             `
             <option value="${d.disciplineId}">${H.escHtml(d.disciplineName)}</option>`
@@ -530,6 +577,11 @@ window.TransactModal = (function () {
                    .join("")
                 : "");
 
+        //Project name
+            _setProjectCodeOptions(_ctx.projectCodes);
+            risProjectCodeSearch.value = "";
+            risProjectCode.value = "";
+
         if (!hasRIS) {
             optMRS.style.opacity     = ".45";
             optMRS.style.cursor      = "not-allowed";
@@ -605,9 +657,11 @@ window.TransactModal = (function () {
     }
 
     function _clearErrors() {
-        [risQty, risIssuedTo, risDiscipline, mrsRISSelect, mrsQty].forEach(el => {
-            if (el) el.classList.remove("error");
-        });
+           [risQty, risDiscipline, risProjectCode, mrsRISSelect, mrsQty].forEach(el => {
+                if (el) el.classList.remove("error");
+            });
+                risProjectCodeSearch?.classList.remove("error");
+
         [risQtyWarn, mrsQtyWarn].forEach(el => {
             if (el) el.style.display = "none";
         });
@@ -618,11 +672,15 @@ window.TransactModal = (function () {
 
         if (_activeType === "ris") {
             if (!risDiscipline.value) { risDiscipline.classList.add("error"); valid = false; }
-            if (!risIssuedTo.value.trim()) { risIssuedTo.classList.add("error"); valid = false; }
             const qty = parseInt(risQty.value, 10);
             if (isNaN(qty) || qty < 1 || qty > _ctx.qtyOnHand) {
                 risQty.classList.add("error"); valid = false;
             }
+            if (!risProjectCode.value) {
+                risProjectCode.classList.add("error");
+                risProjectCodeSearch.classList.add("error");
+                valid = false;
+            }
         } else {
             if (!mrsRISSelect.value) { mrsRISSelect.classList.add("error"); valid = false; }
             const qty    = parseInt(mrsQty.value, 10);
@@ -636,6 +694,117 @@ window.TransactModal = (function () {
         return valid;
     }
 
+        // ── Searchable dropdown refs ────────────────────────────────────────────────
+    let risProjectCode, risProjectCodeSearch, risProjectCodeList;
+    let _projectCodeOptions = [];
+    let _projectCodeActiveIndex = -1;
+
+    function _bindIssuedToSearch() {
+        risIssuedToSearch = document.getElementById("tm-ris-issuedto-search");
+        risIssuedToList   = document.getElementById("tm-ris-issuedto-list");
+
+        risIssuedToSearch.addEventListener("input", _onIssuedToInput);
+        risIssuedToSearch.addEventListener("focus", () => _renderIssuedToList(risIssuedToSearch.value));
+        risIssuedToSearch.addEventListener("keydown", _onIssuedToKeydown);
+
+        document.addEventListener("click", (e) => {
+            if (!risIssuedToSearch.contains(e.target) && !risIssuedToList.contains(e.target)) {
+                _closeIssuedToList();
+            }
+        });
+    }
+
+    function _bindProjectCodeSearch() {
+        risProjectCodeSearch.addEventListener("input", _onProjectCodeInput);
+        risProjectCodeSearch.addEventListener("focus", () => _renderProjectCodeList(risProjectCodeSearch.value));
+        risProjectCodeSearch.addEventListener("keydown", _onProjectCodeKeydown);
+
+        document.addEventListener("click", (e) => {
+            if (!risProjectCodeSearch.contains(e.target) && !risProjectCodeList.contains(e.target)) {
+                _closeProjectCodeList();
+            }
+        });
+    }
+        function _setProjectCodeOptions(projectCodes) {
+        _projectCodeOptions = (projectCodes || []).map(p => ({
+            value: p.projectCodeId,
+            code:  p.projectCode,
+            name:  p.projectName,
+            label: `${p.projectCode} — ${p.projectName}`
+        }));
+    }
+
+        function _onProjectCodeInput() {
+        risProjectCode.value = ""; // invalidate committed selection until re-picked
+        _renderProjectCodeList(risProjectCodeSearch.value);
+    }
+
+    function _renderProjectCodeList(query) {
+        const q = (query || "").trim().toLowerCase();
+        const filtered = q
+            ? _projectCodeOptions.filter(o =>
+                o.name.toLowerCase().includes(q) || o.code.toLowerCase().includes(q))
+            : _projectCodeOptions;
+
+        _projectCodeActiveIndex = -1;
+
+        risProjectCodeList.innerHTML = filtered.length
+            ? filtered.map((o, i) =>
+                `<div class="tm-search-item" data-index="${i}" data-value="${o.value}">
+                    <div>${H.escHtml(o.name)}</div>
+                    <div style="font-size:11px;color:var(--text-muted,#6b8890)">${H.escHtml(o.code)}</div>
+                </div>`).join("")
+            : `<div class="tm-search-empty">No matching projects</div>`;
+
+        risProjectCodeList.querySelectorAll(".tm-search-item").forEach(item => {
+            item.addEventListener("click", () => {
+                const opt = _projectCodeOptions[parseInt(item.dataset.index, 10)];
+                _selectProjectCode(opt);
+            });
+        });
+
+        risProjectCodeList.classList.add("open");
+    }
+
+    function _selectProjectCode(opt) {
+        risProjectCode.value       = opt.value; // ProjectCodeId — this is what gets posted
+        risProjectCodeSearch.value = opt.label; // visible text
+        _closeProjectCodeList();
+        risProjectCode.classList.remove("error");
+        risProjectCodeSearch.classList.remove("error");
+    }
+
+    function _closeProjectCodeList() {
+        risProjectCodeList.classList.remove("open");
+        _projectCodeActiveIndex = -1;
+    }
+
+    function _onProjectCodeKeydown(e) {
+        const items = risProjectCodeList.querySelectorAll(".tm-search-item");
+        if (!items.length) return;
+
+        if (e.key === "ArrowDown") {
+            e.preventDefault();
+            _projectCodeActiveIndex = Math.min(_projectCodeActiveIndex + 1, items.length - 1);
+            _highlightProjectCode(items);
+        } else if (e.key === "ArrowUp") {
+            e.preventDefault();
+            _projectCodeActiveIndex = Math.max(_projectCodeActiveIndex - 1, 0);
+            _highlightProjectCode(items);
+        } else if (e.key === "Enter") {
+            e.preventDefault();
+            const idx = _projectCodeActiveIndex >= 0 ? _projectCodeActiveIndex : 0;
+            const item = items[idx];
+            if (item) _selectProjectCode(_projectCodeOptions[parseInt(item.dataset.index, 10)]);
+        } else if (e.key === "Escape") {
+            _closeProjectCodeList();
+        }
+    }
+
+    function _highlightProjectCode(items) {
+        items.forEach((el, i) => el.classList.toggle("active", i === _projectCodeActiveIndex));
+        items[_projectCodeActiveIndex]?.scrollIntoView({ block: "nearest" });
+    }
     // ════════════════════════════════════════════════════════════════════════
     //  SUBMIT
     // ════════════════════════════════════════════════════════════════════════
@@ -665,7 +834,7 @@ window.TransactModal = (function () {
                 ? {
                     InventoryId:  _ctx.inventoryId,
                     PRDetailId:   parseInt(risPRRef.value, 10) || 0,
-                    IssuedTo:     risIssuedTo.value.trim(),
+                    ProjectCodeId:  parseInt(risProjectCode.value, 10),
                     DisciplineId: parseInt(risDiscipline.value, 10),
                     QtyIssued:    parseInt(risQty.value, 10),
                     Remarks:      risRemarks.value.trim() || null
diff --git a/CPRNIMS.WebApps/Views/Shared/PagesView/PO/_OtherCharges.cshtml b/CPRNIMS.WebApps/Views/Shared/PagesView/PO/_OtherCharges.cshtml
index 62c36bc..0d91036 100644
--- a/CPRNIMS.WebApps/Views/Shared/PagesView/PO/_OtherCharges.cshtml
+++ b/CPRNIMS.WebApps/Views/Shared/PagesView/PO/_OtherCharges.cshtml
@@ -22,4 +22,60 @@
                style="color: green; font-size: 1.5rem; cursor: pointer;" onclick="viewCharges()"></i>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+<script>
+       $(function() {
+        $("#currency").autocomplete({
+            source: function (request, response) {
+                console.log('Autocomplete source called with:', request.term);
+
+                $.ajax({
+                    url: endpoint.GetCurrencies,
+                    data: { query: request.term },
+                    success: function (result) {
+                        console.log('AJAX success:', result);
+
+                        if (result && result.success && Array.isArray(result.data)) {
+                            var formattedData = result.data.map(item => ({
+                                label: item.label || '',
+                                value: item.value !== undefined && item.value !== null ? item.value.toString() : '',
+                                value2: item.value2 !== undefined && item.value2 !== null ? item.value2.toString() : ''
+                            }));
+                            response(formattedData);
+                        } else {
+                            console.error('Invalid data format received:', result);
+                            response([]);
+                        }
+                    },
+                    error: function(xhr, status, error) {
+                        console.error('AJAX error:', status, error);
+                        console.log('Response:', xhr.responseText);
+                        response([]);
+                    }
+                });
+            },
+            minLength: 2,
+            select: function (event, ui) {
+                $('#currency').val(ui.item.label);
+                $('#currencyId').val(ui.item.value);
+                return false;
+            },
+            focus: function (event, ui) {
+                event.preventDefault();
+            },
+            open: function () {
+                var dropdown = $(".ui-autocomplete");
+                dropdown.css({
+                    "max-height": "200px",
+                    "overflow-y": "auto"
+                });
+            },
+            messages: {
+                noResults: '',
+                results: function (count) {
+                    return count + (count > 1 ? ' results' : ' result');
+                }
+            }
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/CPRNIMS.WebApps/Views/Shared/PagesView/PO/_POScripts.cshtml b/CPRNIMS.WebApps/Views/Shared/PagesView/PO/_POScripts.cshtml
index f78d49c..99c5a4a 100644
--- a/CPRNIMS.WebApps/Views/Shared/PagesView/PO/_POScripts.cshtml
+++ b/CPRNIMS.WebApps/Views/Shared/PagesView/PO/_POScripts.cshtml
@@ -12,18 +12,18 @@
 <script src="~/jsfunctions/common/ColumnCommonV2.js"></script>
 <script src="~/jsfunctions/common/genericcrud.js"></script>
 <script src="~/jsfunctions/common/ParamConfigV3.js"></script>
-<script src="~/jsfunctions/common/PostPutV3.js"></script>
+<script src="~/jsfunctions/common/PostPutV4.js"></script>
 <script src="~/jsfunctions/common/PRWOCanvassV2.js"></script>
 
 <script src="~/jsfunctions/po/POButton.js"></script>
 <script src="~/jsfunctions/po/PrintingV2.js"></script>
 <script src="~/JsFunctions/PO/POColumn.js"></script>
-<script src="~/jsfunctions/po/ApiV5.js"></script>
+<script src="~/jsfunctions/po/ApiV6.js"></script>
 <script src="~/jsfunctions/po/populatetable.js"></script>
 <script src="~/jsfunctions/po/POVarV6.js"></script>
 <script src="~/jsfunctions/po/POViewV5.js"></script>
-<script src="~/jsfunctions/po/PopulateDopdownV4.js"></script>
-<script src="~/jsfunctions/po/POPutPostV6.js"></script>
+<script src="~/jsfunctions/po/PopulateDopdownV5.js"></script>
+<script src="~/jsfunctions/po/POPutPostV7.js"></script>
 <script src="~/jsfunctions/po/rowCallBackV6.js"></script>
 
 <script src="~/jsfunctions/utilities/NewStyle.js"></script>
diff --git a/CPRNIMS.WebApps/Views/Shared/PagesView/PR/_PRScripts.cshtml b/CPRNIMS.WebApps/Views/Shared/PagesView/PR/_PRScripts.cshtml
index 9fd175e..2ba6e00 100644
--- a/CPRNIMS.WebApps/Views/Shared/PagesView/PR/_PRScripts.cshtml
+++ b/CPRNIMS.WebApps/Views/Shared/PagesView/PR/_PRScripts.cshtml
@@ -4,9 +4,9 @@
 <link href="~/css/item/item.css" rel="stylesheet" />
 <link href="~/css/common/rowhighlighter.css" rel="stylesheet" />
 
-<script src="~/jsfunctions/pr/PRColumn.js"></script>
+<script src="~/jsfunctions/pr/PRColumnV2.js"></script>
 <script src="~/jsfunctions/pr/PRView.js"></script>
-<script src="~/jsfunctions/pr/PRPostPut.js"></script>
+<script src="~/jsfunctions/pr/PRPostPutV2.js"></script>
 <script src="~/jsfunctions/pr/PRButtonv3.js"></script>
 <script src="~/jsfunctions/pr/PRVarV3.js"></script>
 <script src="~/jsfunctions/pr/ConfigV7.js"></script>
diff --git a/CPRNIMS.WebApps/Views/Shared/PartialView/_PartialScripts.cshtml b/CPRNIMS.WebApps/Views/Shared/PartialView/_PartialScripts.cshtml
index b842801..f15e2d6 100644
--- a/CPRNIMS.WebApps/Views/Shared/PartialView/_PartialScripts.cshtml
+++ b/CPRNIMS.WebApps/Views/Shared/PartialView/_PartialScripts.cshtml
@@ -6,7 +6,7 @@
 <script src="~/js/sidebar.js"></script>
 <script src="~/Datatables/DataTables-1.13.6/js/jquery.dataTables.min.js"></script>
 <script src="~/datatables/responsive-2.5.0/js/datatables.responsive.min.js"></script>
-<script src="~/jsfunctions/account/sessionTimeoutV4.js"></script>
+<script src="~/jsfunctions/account/sessionTimeoutV5.js"></script>
 <script src="~/lib/jquery-ui-1132custom/jquery-ui.min.js"></script>
 
 <!-- DataTables Buttons and Export JS -->
diff --git a/CPRNIMS.WebApps/appsettings.json b/CPRNIMS.WebApps/appsettings.json
index 9f5b4dd..74204bb 100644
--- a/CPRNIMS.WebApps/appsettings.json
+++ b/CPRNIMS.WebApps/appsettings.json
@@ -160,7 +160,8 @@
         "GetIndexCard": "api/POMgmt/GetIndexCard/",
         "GetIncotermsByName": "api/POMgmt/GetIncotermsByName/",
         "GetPortOfDischarge": "api/POMgmt/GetPortOfDischarge/",
-        "GetIncomingShipment": "api/POMgmt/GetIncomingShipment/"
+        "GetIncomingShipment": "api/POMgmt/GetIncomingShipment/",
+        "GetCurrencies": "api/POMgmt/GetCurrencies/"
       },
       "SMTPMgmt": {
         "PostPutSmtp": "api/SMTPMgmt/PostPutSmtp/",
@@ -199,7 +200,17 @@
         "ApproveRIS": "api/RISMgmt/ApproveRIS/",
         "CancelRIS": "api/RISMgmt/CancelRIS/",
         "CreateRIS": "api/RISMgmt/",
-        "GetRIS": "api/RISMgmt/GetRIS/"
+        "GetRIS": "api/RISMgmt/GetRIS/",
+        "GetMRS": "api/MRSMgmt/",
+        "SearchRIS": "api/MRSMgmt/SearchRIS/",
+        "SearchProjects": "api/MRSMgmt/SearchProjects/",
+        "ApproveMRS": "api/MRSMgmt/Approve/",
+        "CancelMRS": "api/MRSMgmt/Cancel/",
+        "CreateMRS": "api/MRSMgmt/",
+        "RISReportData": "api/InventoryReports/GetRISData/",
+        "GetRISReport": "api/InventoryReports/GetRISReport/",
+        "GetMRSReport": "api/InventoryReports/GetMRSReport/",
+        "GetInventoryReport": "api/InventoryReports/GetInventoryReport/"
       },
       "ImageUploadSettings": {
         "UploadPath": "C:\\WebApps\\wwwroot\\Content\\Images"
diff --git a/CPRNIMS.WebApps/wwwroot/JsFunctions/Account/sessionTimeoutV4.js b/CPRNIMS.WebApps/wwwroot/JsFunctions/Account/sessionTimeoutV5.js
similarity index 96%
rename from CPRNIMS.WebApps/wwwroot/JsFunctions/Account/sessionTimeoutV4.js
rename to CPRNIMS.WebApps/wwwroot/JsFunctions/Account/sessionTimeoutV5.js
index d15f0fe..ea0ff93 100644
--- a/CPRNIMS.WebApps/wwwroot/JsFunctions/Account/sessionTimeoutV4.js
+++ b/CPRNIMS.WebApps/wwwroot/JsFunctions/Account/sessionTimeoutV5.js
@@ -132,7 +132,7 @@ function handleStayLoggedIn() {
         updateLastActivity();
     }
 
-    console.log('User chose to stay logged in - session extended');
+   // console.log('User chose to stay logged in - session extended');
 }
 
 /**
@@ -145,7 +145,7 @@ function handleLogout() {
         countdownInterval = null;
     }
 
-    console.log('Session timeout - logging out...');
+    //console.log('Session timeout - logging out...');
 
     // Perform logout
     performLogout();
@@ -167,7 +167,7 @@ function handleLogout() {
         try {
             const timestamp = Date.now();
             sessionStorage.setItem(CONFIG.storageKey, timestamp.toString());
-            console.log('Activity updated:', new Date(timestamp).toLocaleTimeString());
+            //console.log('Activity updated:', new Date(timestamp).toLocaleTimeString());
             warningShown = false; // Reset warning flag on activity
         } catch (e) {
             console.error('Failed to update last activity:', e);
@@ -204,7 +204,7 @@ function handleLogout() {
         const inactiveTime = now - lastActivity;
         const inactiveMinutes = Math.floor(inactiveTime / 60000);
 
-        console.log(`Session check - Inactive for: ${inactiveMinutes} minutes`);
+        //console.log(`Session check - Inactive for: ${inactiveMinutes} minutes`);
 
         // Check if session has expired
         if (inactiveTime >= sessionTimeout) {
diff --git a/CPRNIMS.WebApps/wwwroot/JsFunctions/Common/PostPutV3.js b/CPRNIMS.WebApps/wwwroot/JsFunctions/Common/PostPutV4.js
similarity index 96%
rename from CPRNIMS.WebApps/wwwroot/JsFunctions/Common/PostPutV3.js
rename to CPRNIMS.WebApps/wwwroot/JsFunctions/Common/PostPutV4.js
index 1d89e7a..327c664 100644
--- a/CPRNIMS.WebApps/wwwroot/JsFunctions/Common/PostPutV3.js
+++ b/CPRNIMS.WebApps/wwwroot/JsFunctions/Common/PostPutV4.js
@@ -67,6 +67,7 @@ function poValidateParameters(poTypeId, method, isItem) {
         updateSharedVariables(inputs, customPOConfig);
     }
     poDTO(customPOConfig);
+
     return isValid;
 }
 function parameters(method) {
@@ -85,6 +86,7 @@ function parameters(method) {
             supplierId: document.getElementById('supplierId'),
             deliveryDate: document.getElementById('deliveryDate'),
             paymentTermsId: document.getElementById('C-paymentTermsId'),
+            currencyId: document.getElementById('currencyId')
         };
     }
     return paramValue;
@@ -97,6 +99,7 @@ function clearCustomPOParam() {
         profInvoiceDate: new Date().toISOString().split('T')[0],
         shippingInstructionId: 0,
         podId: 0,
+        currencyId: 0,
         paymentTermsId: 0,
         supplierId: 0,
         supplierName: '',
@@ -104,6 +107,7 @@ function clearCustomPOParam() {
         deliveryDate: new Date().toISOString().split('T')[0],
         deliverTo: ''
     };
+
     $('#poNo').val('');
     $('#poType').val(0);
     $('#supplierName').val('');
@@ -115,6 +119,7 @@ function clearCustomPOParam() {
     $('#finalAmount').val(0.00);
     $('#docRequiredId').val('');
     $('#discount').val('');
+    $('#currency').val('');
 
     $('#grossAmountPHP').val(0.00);
     $('#finalAmountPHP').val(0.00);
@@ -142,4 +147,5 @@ function poDTO(config) {
     Qty = config.qty;
     UOMName = config.uomName;
     UOMId = config.uomId;
+    CurrencyId = config.currencyId;
 }
\ No newline at end of file
diff --git a/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/ApiV5.js b/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/ApiV6.js
similarity index 97%
rename from CPRNIMS.WebApps/wwwroot/JsFunctions/PO/ApiV5.js
rename to CPRNIMS.WebApps/wwwroot/JsFunctions/PO/ApiV6.js
index 9cfcd01..6cfbf2f 100644
--- a/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/ApiV5.js
+++ b/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/ApiV6.js
@@ -17,6 +17,7 @@
     GetPortOfDischarge: "/POMgmt/GetPortOfDischarge",
     GetPOListByTerm: "/POMgmt/GetPOListByTerm",
     GetIncotermsByName: "/POMgmt/GetIncotermsByName",
+    GetCurrencies: "/POMgmt/GetCurrencies",
 
     PutPOCancel: "/POMgmt/PutPOCancel",
     PutPOItemDetail: "/POMgmt/PutPOItemDetail",
diff --git a/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/CustomPOV9.js b/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/CustomPO.js
similarity index 98%
rename from CPRNIMS.WebApps/wwwroot/JsFunctions/PO/CustomPOV9.js
rename to CPRNIMS.WebApps/wwwroot/JsFunctions/PO/CustomPO.js
index 9ebd7ad..8c2c9e6 100644
--- a/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/CustomPOV9.js
+++ b/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/CustomPO.js
@@ -62,7 +62,10 @@ async function fetchAndPopulatePOFormData(poType, poId = null) {
                     $('#countryOrigin').val(d.header.countryOrigin || '');
                     $('#currencyCER').val(d.header.currencyCER || '59.00');
                     $('#podId').val(d.header.podId || 0);
-                    console.log('shipping Instruction', d.header.shippingInstructionId);
+
+                    $('#currency').val(d.header.currencyName || '');
+                    $('#currencyId').val(d.header.currencyId || 1);
+
                     $('#shippingInstructionId').val(d.header.shippingInstructionId);
                     $('#discount').val(d.header.discount || 0);
                     
diff --git a/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/POPutPostV6.js b/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/POPutPostV7.js
similarity index 99%
rename from CPRNIMS.WebApps/wwwroot/JsFunctions/PO/POPutPostV6.js
rename to CPRNIMS.WebApps/wwwroot/JsFunctions/PO/POPutPostV7.js
index 4088ea6..c6a4804 100644
--- a/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/POPutPostV6.js
+++ b/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/POPutPostV7.js
@@ -252,7 +252,7 @@ function postPutCustomPO() {
                     data: {
                         DocRequiredList, OtherChargesList, PRItemList, CountryOrigin,
                         POTypeId, PONo, IncotermsId, ProfInvoiceNo, ProfInvoiceDate,
-                        ShippingInstructionId, PodId, PaymentTermsId,
+                        ShippingInstructionId, PodId, PaymentTermsId,CurrencyId,
                         PoRemarks, Discount, SupplierId, DeliveryDate, DeliverTo
                     },
                     success: function (response) {
@@ -306,7 +306,7 @@ function updateExistingPO() {
                 data: {
                     DocRequiredList, OtherChargesList, PRItemList, CountryOrigin,
                     POTypeId, PONo, IncotermsId, ProfInvoiceNo, ProfInvoiceDate,
-                    ShippingInstructionId, PodId, PaymentTermsId,
+                    ShippingInstructionId, PodId, PaymentTermsId,CurrencyId,
                     PoRemarks, Discount, SupplierId, DeliveryDate, DeliverTo, IsUpdate
                 },
                 success: function (response) {
@@ -700,7 +700,6 @@ function AddItem() {
 
     toggleSubmitButton();
 }
-
 function AddDocRequired() {
     var selectedCheckboxes = $('.select-DocRequired-checkbox:checked');
     var DocRequiredList = [];
@@ -796,7 +795,6 @@ function AddDiscount() {
     calculateFinalUsdAmount();
     lessDiscount();
 }
-
 function removeRowMain(rowData) {
     var poDataTable = $('#PODataTable').DataTable();
 
diff --git a/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/PopulateDopdownV4.js b/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/PopulateDopdownV5.js
similarity index 98%
rename from CPRNIMS.WebApps/wwwroot/JsFunctions/PO/PopulateDopdownV4.js
rename to CPRNIMS.WebApps/wwwroot/JsFunctions/PO/PopulateDopdownV5.js
index 973bb84..f42c3e3 100644
--- a/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/PopulateDopdownV4.js
+++ b/CPRNIMS.WebApps/wwwroot/JsFunctions/PO/PopulateDopdownV5.js
@@ -308,7 +308,8 @@ function populateSupplier() {
                             value: item.value !== undefined && item.value !== null ? item.value.toString() : '',
                             value2: item.value2 !== undefined && item.value2 !== null ? item.value2.toString() : '',
                             value3: item.value3 !== undefined && item.value3 !== null ? item.value3.toString() : '',
-                            value4: item.value4 !== undefined && item.value4 !== null ? item.value4.toString() : ''
+                            value4: item.value4 !== undefined && item.value4 !== null ? item.value4.toString() : '',
+                            value5: item.value5 !== undefined && item.value5 !== null ? item.value5.toString() : ''
                         }));
                         response(formattedData);
                     } else {
@@ -325,6 +326,7 @@ function populateSupplier() {
             $('#currency').val(ui.item.value2);
             $('#C-paymentTerms').val(ui.item.value3);
             $('#C-paymentTermsId').val(ui.item.value4);
+            $('#currencyId').val(ui.item.value5);
 
             return false;
         },
diff --git a/CPRNIMS.WebApps/wwwroot/JsFunctions/PR/PRColumn.js b/CPRNIMS.WebApps/wwwroot/JsFunctions/PR/PRColumnV2.js
similarity index 99%
rename from CPRNIMS.WebApps/wwwroot/JsFunctions/PR/PRColumn.js
rename to CPRNIMS.WebApps/wwwroot/JsFunctions/PR/PRColumnV2.js
index cf89e14..63081bd 100644
--- a/CPRNIMS.WebApps/wwwroot/JsFunctions/PR/PRColumn.js
+++ b/CPRNIMS.WebApps/wwwroot/JsFunctions/PR/PRColumnV2.js
@@ -255,6 +255,7 @@ var colOnProjectCode = [
     { data: 'projectName' },
     { data: 'deliveryAddress' },
     { data: 'maxDays' },
+    { data: 'statusName' },
     {
         data: 'isActive',
         render: function (data) {
diff --git a/CPRNIMS.WebApps/wwwroot/JsFunctions/PR/PRPostPut.js b/CPRNIMS.WebApps/wwwroot/JsFunctions/PR/PRPostPutV2.js
similarity index 99%
rename from CPRNIMS.WebApps/wwwroot/JsFunctions/PR/PRPostPut.js
rename to CPRNIMS.WebApps/wwwroot/JsFunctions/PR/PRPostPutV2.js
index 9e571e6..0a69c8c 100644
--- a/CPRNIMS.WebApps/wwwroot/JsFunctions/PR/PRPostPut.js
+++ b/CPRNIMS.WebApps/wwwroot/JsFunctions/PR/PRPostPutV2.js
@@ -71,6 +71,7 @@ function postPutProjectCode() {
         ProjectCodeId: Number($('#projectCodeId').val()) || 0,
         ProjectCode: $('#projectCode').val().trim(),
         ProjectName: $('#projectName').val().trim(),
+        StatusName: $('#projectStatus').val().trim(),
         DeliveryAddress: $('#deliveryAddress').val().trim(),
         MaxDays: parseInt($('#maxDays').val(), 10),
         IsActive: $('#statusSwitch').is(':checked')