From 3cc90e9b42c62e9fd211d3baecb882af03c7df6d Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 28 Aug 2021 00:54:07 -0400 Subject: [PATCH] Fixed Transfer Account --- post.php | 2 +- recurring.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/post.php b/post.php index d44e1452..ad6f6ee6 100644 --- a/post.php +++ b/post.php @@ -1647,7 +1647,7 @@ if(isset($_POST['add_transfer'])){ mysqli_query($mysqli,"INSERT INTO revenues SET revenue_date = '$date', revenue_amount = '$amount', revenue_currency_code = '$config_default_currency', revenue_account_id = $account_to, revenue_category_id = 0, revenue_created_at = NOW(), company_id = $session_company_id"); $revenue_id = mysqli_insert_id($mysqli); - mysqli_query($mysqli,"INSERT INTO transfers SET expense_id = $expense_id, revenue_id = $revenue_id, transfer_notes = '$notes', transfer_created_at = NOW(), company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO transfers SET transfer_expense_id = $expense_id, transfer_revenue_id = $revenue_id, transfer_notes = '$notes', transfer_created_at = NOW(), company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Transfer', log_action = 'Created', log_description = '$date - $amount', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id"); diff --git a/recurring.php b/recurring.php index c72526bf..7c5b947f 100644 --- a/recurring.php +++ b/recurring.php @@ -74,7 +74,7 @@ $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM recurring LEFT JOIN clients ON recurring_client_id = client_id - LEFT JOIN categories ON recurring_category_id = category_id + JOIN categories ON recurring_category_id = category_id WHERE recurring.company_id = $session_company_id AND (CONCAT(recurring_prefix,recurring_number) LIKE '%$q%' OR recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR category_name LIKE '%$q%') AND DATE(recurring_last_sent) BETWEEN '$dtf' AND '$dtt'