From 4fec57709a4697a3ea3dfb257ed952818d34caa5 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Sat, 1 Aug 2026 12:09:39 -0400
Subject: [PATCH] Recurring Expense: Fix edit not keeping client

---
 agent/modals/recurring_expense/recurring_expense_edit.php | 4 ++--
 agent/post/recurring_expense.php                          | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/agent/modals/recurring_expense/recurring_expense_edit.php b/agent/modals/recurring_expense/recurring_expense_edit.php
index 620207d3..e337fb85 100644
--- a/agent/modals/recurring_expense/recurring_expense_edit.php
+++ b/agent/modals/recurring_expense/recurring_expense_edit.php
@@ -31,8 +31,8 @@ if ($client_id) {
     enforceClientAccess();
 }
 
-// Generate the HTML form content using output buffering.
 ob_start();
+
 ?>
 
 <div class="modal-header bg-dark">
@@ -240,7 +240,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                         </div>
-                        <select class="form-control select2" name="client">
+                        <select class="form-control select2" name="client_id">
                             <option value="">- Select Client -</option>
                             <?php
 
diff --git a/agent/post/recurring_expense.php b/agent/post/recurring_expense.php
index 161d8c45..b683d357 100644
--- a/agent/post/recurring_expense.php
+++ b/agent/post/recurring_expense.php
@@ -23,6 +23,10 @@ if (isset($_POST['create_recurring_expense'])) {
     $description = escapeSql($_POST['description']);
     $reference = escapeSql($_POST['reference']);
 
+    if ($client_id) {
+        enforceClientAccess();
+    }
+
     $year = date('Y');
     if (strtotime("$year-$month-$day") < time()) {
         $year++;
@@ -59,6 +63,10 @@ if (isset($_POST['edit_recurring_expense'])) {
     $description = escapeSql($_POST['description']);
     $reference = escapeSql($_POST['reference']);
 
+    if ($client_id) {
+        enforceClientAccess();
+    }
+
     $year = date('Y');
     if (strtotime("$year-$month-$day") < time()) {
         $year++;