diff --git a/Marco.Pms.Services/Service/ExpensesService.cs b/Marco.Pms.Services/Service/ExpensesService.cs index dd672f0..b899c65 100644 --- a/Marco.Pms.Services/Service/ExpensesService.cs +++ b/Marco.Pms.Services/Service/ExpensesService.cs @@ -778,7 +778,7 @@ namespace Marco.Pms.Services.Service expense.Status = processedStatus; expense.ProcessedById = loggedInEmployee.Id; - var lastTransaction = await _context.AdvancePaymentTransactions.OrderByDescending(apt => apt.CreatedAt).FirstOrDefaultAsync(apt => apt.TenantId == tenantId); + var lastTransaction = await _context.AdvancePaymentTransactions.OrderByDescending(apt => apt.CreatedAt).FirstOrDefaultAsync(apt => apt.EmployeeId == expense.PaidById && apt.TenantId == tenantId); double lastBalance = 0; if (lastTransaction != null) { @@ -1968,7 +1968,7 @@ namespace Marco.Pms.Services.Service await using var context = await _dbContextFactory.CreateDbContextAsync(); return await context.AdvancePaymentTransactions .OrderByDescending(apt => apt.CreatedAt) - .FirstOrDefaultAsync(apt => apt.TenantId == tenantId); + .FirstOrDefaultAsync(apt => apt.EmployeeId == paymentRequest.CreatedById && apt.TenantId == tenantId); }); var doneStatusTask = Task.Run(async () =>