Dev

applications/Unity.GrantManager/common.props

@@ -16,4 +16,10 @@
     <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Add direct reference to the patched Scriban to ensure all projects importing common.props
+         use the safe version (pins transitive consumers that do not specify a version). -->
+    <PackageReference Include="Scriban" Version="7.2.0" />
+  </ItemGroup>
+
 </Project>

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/RateLimit/AIRateLimitStateDto.cs

@@ -3,4 +3,5 @@ namespace Unity.AI.RateLimit;
 public class AIRateLimitStateDto
 {
     public int RetryAfterSeconds { get; set; }
+    public bool IsGenerating { get; set; }
 }

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/RateLimit/IAIGenerationActivityProvider.cs

@@ -0,0 +1,8 @@
+using System.Threading.Tasks;
+
+namespace Unity.AI.RateLimit;
+
+public interface IAIGenerationActivityProvider
+{
+    Task<bool> HasActiveGenerationAsync();
+}

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/RateLimit/IAIRateLimiter.cs

@@ -22,8 +22,8 @@ public interface IAIRateLimiter
     Task StampAsync(Guid? userId);
 
     /// <summary>
-    /// Returns the remaining cooldown for the current user. RetryAfterSeconds is 0 when
-    /// the user can generate immediately.
+    /// Returns the current user's shared AI generation state. RetryAfterSeconds is 0 when
+    /// the user can generate immediately, unless a generation is still active.
     /// </summary>
     Task<AIRateLimitStateDto> GetStateAsync();
 }

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/RateLimit/AIRateLimiter.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Threading.Tasks;
 using Medallion.Threading;
@@ -20,7 +21,8 @@ public class AIRateLimiter(
     IDistributedCache cache,
     ICurrentUser currentUser,
     IConfiguration configuration,
-    IDistributedLockProvider distributedLockProvider) : IAIRateLimiter, ITransientDependency
+    IDistributedLockProvider distributedLockProvider,
+    IEnumerable<IAIGenerationActivityProvider> generationActivityProviders) : IAIRateLimiter, ITransientDependency
 {
     private const string CooldownKeyPrefix = "ai-generation:cooldown:";
     private const string CooldownLockPrefix = "ai-generation:cooldown-lock:";
@@ -81,19 +83,33 @@ public virtual async Task<AIRateLimitStateDto> GetStateAsync()
     {
         if (currentUser.Id is not Guid userId)
         {
-            return new AIRateLimitStateDto { RetryAfterSeconds = 0 };
+            return new AIRateLimitStateDto { RetryAfterSeconds = 0, IsGenerating = false };
         }
 
         var userLock = distributedLockProvider.CreateLock(CooldownLockPrefix + userId);
         using (await userLock.AcquireAsync())
         {
             return new AIRateLimitStateDto
             {
-                RetryAfterSeconds = await GetRemainingSecondsAsync(userId)
+                RetryAfterSeconds = await GetRemainingSecondsAsync(userId),
+                IsGenerating = await HasActiveGenerationAsync()
             };
         }
     }
 
+    private async Task<bool> HasActiveGenerationAsync()
+    {
+        foreach (var provider in generationActivityProviders)
+        {
+            if (await provider.HasActiveGenerationAsync())
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private async Task<int> GetRemainingSecondsAsync(Guid userId)
     {
         var raw = await cache.GetStringAsync(KeyFor(userId));

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/FlexApplicationMapperlyProfile.cs

@@ -32,6 +32,7 @@ public override void Map(Worksheet source, WorksheetDto destination)
         destination.Version = source.Version;
         destination.Published = source.Published;
         destination.ReportViewName = source.ReportViewName;
+        destination.IsArchived = source.IsArchived;
         destination.Sections = source.Sections?
             .Select(s => new WorksheetSectionMapper().Map(s))
             .ToList() ?? [];

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/Enums/PaymentRequestStatus.cs

@@ -18,5 +18,6 @@ public enum PaymentRequestStatus
         Paid = 10,
         Failed = 11,        
         FSB = 12, // Financial Services Branch - Prevent CAS Payment
+        HistoricalPayment = 13,
     }
 }

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/CreateHistoricalPaymentRequestDto.cs

@@ -0,0 +1,28 @@
+using System;
+
+namespace Unity.Payments.PaymentRequests
+{
+#pragma warning disable CS8618
+    [Serializable]
+    public class CreateHistoricalPaymentRequestDto
+    {
+        public string InvoiceNumber { get; set; }
+        public decimal Amount { get; set; }
+        public string? Description { get; set; }
+        public Guid CorrelationId { get; set; }
+        public Guid? SiteId { get; set; }
+        public string PayeeName { get; set; }
+        public string ContractNumber { get; set; }
+        public string? SupplierNumber { get; set; }
+        public string? SupplierName { get; set; }
+        public string CorrelationProvider { get; set; } = string.Empty;
+        public string BatchName { get; set; }
+        public decimal BatchNumber { get; set; } = 0;
+        public string ReferenceNumber { get; set; } = string.Empty;
+        public string SubmissionConfirmationCode { get; set; } = string.Empty;
+        public Guid? AccountCodingId { get; set; }
+        public string? Note { get; set; }
+        public string PaidDate { get; set; }
+    }
+#pragma warning restore CS8618
+}

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/IPaymentRequestAppService.cs

@@ -9,6 +9,7 @@ namespace Unity.Payments.PaymentRequests
     public interface IPaymentRequestAppService : IApplicationService
     {
         Task<List<PaymentRequestDto>> CreateAsync(List<CreatePaymentRequestDto> paymentRequests);
+        Task<List<PaymentRequestDto>> CreateHistoricalAsync(List<CreateHistoricalPaymentRequestDto> paymentRequests);
         Task<PagedResultDto<PaymentRequestDto>> GetListAsync(PagedAndSortedResultRequestDto input);
         Task<decimal> GetTotalPaymentRequestAmountByCorrelationIdAsync(Guid correlationId);
         Task<List<PaymentDetailsDto>> GetListByApplicationIdAsync(Guid applicationId);

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Exceptions/ErrorConsts.cs

@@ -9,5 +9,7 @@ public static class ErrorConsts
         public const string InvalidAccountCodingField = "Unity.Payments:Errors:InvalidAccountCodingFiled";
         public const string L2ApproverRestriction = "Unity.Payments:Errors:L2ApproverRestriction";
         public const string MissingSupplierNumber = "Unity.Payments:Errors:MissingSupplierNumber";
+        public const string MissingSite = "Unity.Payments:Errors:MissingSite";
+        public const string MissingAccountCoding = "Unity.Payments:Errors:MissingAccountCoding";
     }
 }

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/PaymentRequests/PaymentRequest.cs

@@ -9,6 +9,7 @@
 using Volo.Abp;
 using Unity.Payments.Domain.Exceptions;
 using Unity.Payments.PaymentRequests;
+using Unity.Payments.Codes;
 using Unity.Payments.Domain.PaymentTags;
 using Unity.Payments.Domain.AccountCodings;
 
@@ -17,14 +18,8 @@ namespace Unity.Payments.Domain.PaymentRequests
     public class PaymentRequest : FullAuditedAggregateRoot<Guid>, IMultiTenant, ICorrelationEntity
     {
         public Guid? TenantId { get; set; }
-        public virtual Guid SiteId { get; set; }
-        public virtual Site Site
-        {
-            set => _site = value;
-            get => _site
-                   ?? throw new InvalidOperationException("Uninitialized property: " + nameof(Site));
-        }
-        private Site? _site;
+        public virtual Guid? SiteId { get; set; }
+        public virtual Site? Site { get; set; }
 
         public virtual string InvoiceNumber { get; private set; } = string.Empty;
         public virtual decimal Amount { get; private set; }
@@ -110,6 +105,35 @@ public PaymentRequest(Guid id, CreatePaymentRequestDto createPaymentRequestDto)
             ValidatePaymentRequest();
         }
 
+        public PaymentRequest(Guid id, CreateHistoricalPaymentRequestDto dto) : base(id)
+        {
+            InvoiceNumber = dto.InvoiceNumber;
+            Amount = dto.Amount;
+            PayeeName = dto.PayeeName;
+            ContractNumber = dto.ContractNumber;
+            SupplierNumber = dto.SupplierNumber ?? string.Empty;
+            SupplierName = dto.SupplierName;
+            SiteId = dto.SiteId;
+            Description = dto.Description;
+            CorrelationId = dto.CorrelationId;
+            CorrelationProvider = dto.CorrelationProvider;
+            ReferenceNumber = dto.ReferenceNumber;
+            SubmissionConfirmationCode = dto.SubmissionConfirmationCode;
+            BatchName = dto.BatchName;
+            BatchNumber = dto.BatchNumber;
+            AccountCodingId = dto.AccountCodingId;
+            Note = dto.Note;
+            Status = PaymentRequestStatus.HistoricalPayment;
+            PaymentStatus = CasPaymentRequestStatus.Paid;
+            InvoiceStatus = CasPaymentRequestStatus.Paid;
+            PaymentDate = dto.PaidDate;
+            ExpenseApprovals = [];
+            PaymentTags = null;
+
+            if (Amount <= 0)
+                throw new BusinessException(ErrorConsts.ZeroPayment);
+        }
+
         public PaymentRequest SetNote(string note)
         {
             Note = note;
@@ -210,6 +234,16 @@ public PaymentRequest ValidatePaymentRequest()
                 throw new BusinessException(ErrorConsts.MissingSupplierNumber);
             }
 
+            if (!SiteId.HasValue || SiteId.Value == Guid.Empty)
+            {
+                throw new BusinessException(ErrorConsts.MissingSite);
+            }
+
+            if (!AccountCodingId.HasValue || AccountCodingId.Value == Guid.Empty)
+            {
+                throw new BusinessException(ErrorConsts.MissingAccountCoding);
+            }
+
             return this;
         }
     }

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/InvoiceManager.cs

@@ -25,7 +25,8 @@ public class InvoiceManager(
     {
         public async Task<Site?> GetSiteByPaymentRequestAsync(PaymentRequest paymentRequest)
         {
-            Site? site = await siteRepository.GetAsync(paymentRequest.SiteId, true);
+            if (!paymentRequest.SiteId.HasValue) return null;
+            Site? site = await siteRepository.GetAsync(paymentRequest.SiteId.Value, true);
             if (site?.SupplierId != null)
             {
                 Supplier supplier = await supplierRepository.GetAsync(site.SupplierId);

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentRequestQueryManager.cs

@@ -209,8 +209,11 @@ public async Task ManuallyAddPaymentRequestsToReconciliationQueueAsync(List<Guid
                 if (paymentRequest != null)
                 {
                     var paymentRequestDto = objectMapper.Map<PaymentRequest, PaymentRequestDto>(paymentRequest);
-                    Site site = await siteRepository.GetAsync(paymentRequest.SiteId);
-                    paymentRequestDto.Site = objectMapper.Map<Site, SiteDto>(site);
+                    if (paymentRequest.SiteId.HasValue)
+                    {
+                        Site site = await siteRepository.GetAsync(paymentRequest.SiteId.Value);
+                        paymentRequestDto.Site = objectMapper.Map<Site, SiteDto>(site);
+                    }
                     paymentRequestDtos.Add(paymentRequestDto);
                 }
             }

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs

@@ -33,6 +33,7 @@ public static void ConfigurePayments(
             b.HasOne(e => e.Site)
                 .WithMany()
                 .HasForeignKey(x => x.SiteId)
+                .IsRequired(false)
                 .OnDelete(DeleteBehavior.NoAction);
 
             b.HasOne(e => e.AccountCoding)

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/Repositories/PaymentRequestRepository.cs

@@ -140,8 +140,9 @@ public async Task<List<ApplicationPaymentRollupDto>> GetBatchPaymentRollupsByCor
                 {
                     ApplicationId = g.Key,
                     TotalPaid = g
-                        .Where(p => p.PaymentStatus != null
-                            && p.PaymentStatus.Trim().ToUpper() == CasPaymentRequestStatus.FullyPaid.ToUpper())
+                        .Where(p => (p.PaymentStatus != null
+                                && p.PaymentStatus.Trim().ToUpper() == CasPaymentRequestStatus.FullyPaid.ToUpper())
+                            || p.Status == PaymentRequestStatus.HistoricalPayment)
                         .Sum(p => p.Amount),
                     TotalPending = g
                         .Where(p => p.Status == PaymentRequestStatus.L1Pending

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/SupplierService.cs

@@ -146,7 +146,9 @@ string GetProp(string name) =>
             string supplierprotected = GetProp("supplierprotected");
             string standardindustryclassification = GetProp("standardindustryclassification");
 
-            _ = DateTime.TryParse(lastUpdated, System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None, out DateTime lastUpdatedDate);
+            DateTime? lastUpdatedDate = DateTime.TryParse(lastUpdated, System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None, out DateTime parsedLastUpdated)
+                ? parsedLastUpdated
+                : null;
 
             var siteEtos = new List<SiteEto>();
             if (casSupplierResponse.TryGetProperty("supplieraddress", out var sitesJson) &&
@@ -181,7 +183,9 @@ public static SiteEto GetSiteEto(JsonElement site)
                 ? new string('*', accountNumber.Length - 4) + accountNumber[^4..]
                 : accountNumber;
             string siteLastUpdated = GetJsonProperty("lastupdated", site);
-            _ = DateTime.TryParse(siteLastUpdated, System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None, out DateTime siteLastUpdatedDate);
+            DateTime? siteLastUpdatedDate = DateTime.TryParse(siteLastUpdated, System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None, out DateTime parsedSiteLastUpdated)
+                ? parsedSiteLastUpdated
+                : null;
 
             return new SiteEto
             {

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/CasPaymentRequestCoordinator.cs

@@ -55,7 +55,7 @@ public async Task AddPaymentRequestsToInvoiceQueue(PaymentRequest paymentRequest
                         PaymentRequestId = paymentRequest.Id,
                         InvoiceNumber = paymentRequest.InvoiceNumber,
                         SupplierNumber = paymentRequest.SupplierNumber,
-                        SiteNumber = paymentRequest.Site.Number,
+                        SiteNumber = paymentRequest.Site?.Number ?? string.Empty,
                         TenantId = (Guid)currentTenant.Id
                     };
 
@@ -103,7 +103,7 @@ public async Task AddPaymentRequestsToReconciliationQueue()
                             PaymentRequestId = paymentRequest.Id,
                             InvoiceNumber = paymentRequest.InvoiceNumber,
                             SupplierNumber = paymentRequest.SupplierNumber,
-                            SiteNumber = paymentRequest.Site.Number,
+                            SiteNumber = paymentRequest.Site?.Number ?? string.Empty,
                             TenantId = tenantId
                         };