From cd40a97ae88edcaf87d679677a121bd17d9546ec Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 25 Jan 2025 00:30:48 -0500 Subject: [PATCH] Use company currency code when autopay creates an expense, sort Invoices DESC --- invoices.php | 2 +- scripts/cron.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/invoices.php b/invoices.php index 87ad2599..b93a7d09 100644 --- a/invoices.php +++ b/invoices.php @@ -2,7 +2,7 @@ // Default Column Sortby/Order Filter $sort = "invoice_number"; -$order = "ASC"; +$order = "DESC"; require_once "includes/inc_all.php"; diff --git a/scripts/cron.php b/scripts/cron.php index d21123a2..4df62f61 100644 --- a/scripts/cron.php +++ b/scripts/cron.php @@ -804,7 +804,7 @@ while ($row = mysqli_fetch_array($sql_recurring)) { // Create Stripe payment gateway fee as an expense (if configured) if ($config_stripe_expense_vendor > 0 && $config_stripe_expense_category > 0) { $gateway_fee = round($invoice_amount * $config_stripe_percentage_fee + $config_stripe_flat_fee, 2); - mysqli_query($mysqli,"INSERT INTO expenses SET expense_date = '$pi_date', expense_amount = $gateway_fee, expense_currency_code = '$invoice_currency_code', expense_account_id = $config_stripe_account, expense_vendor_id = $config_stripe_expense_vendor, expense_client_id = $client_id, expense_category_id = $config_stripe_expense_category, expense_description = 'Stripe Transaction for Invoice $invoice_prefix$invoice_number In the Amount of $balance_to_pay', expense_reference = 'Stripe - $pi_id $extended_log_desc'"); + mysqli_query($mysqli,"INSERT INTO expenses SET expense_date = '$pi_date', expense_amount = $gateway_fee, expense_currency_code = '$company_currency', expense_account_id = $config_stripe_account, expense_vendor_id = $config_stripe_expense_vendor, expense_client_id = $client_id, expense_category_id = $config_stripe_expense_category, expense_description = 'Stripe Transaction for Invoice $invoice_prefix$invoice_number In the Amount of $balance_to_pay', expense_reference = 'Stripe - $pi_id $extended_log_desc'"); } // Notify/log