From c7fa25a75b6a5c51aac91dec186217b134d7bcbc Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Thu, 10 Jan 2019 16:29:01 +0100 Subject: [PATCH] Fixed allocation date for customer payments entry, additional fixes for strict sql mode. --- includes/db/audit_trail_db.inc | 6 +++--- sales/customer_payments.php | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/includes/db/audit_trail_db.inc b/includes/db/audit_trail_db.inc index 6aa91d98..feb85a99 100644 --- a/includes/db/audit_trail_db.inc +++ b/includes/db/audit_trail_db.inc @@ -16,17 +16,17 @@ function add_audit_trail($trans_type, $trans_no, $trans_date, $descr='') $date = date2sql($trans_date); $sql = "INSERT INTO ".TB_PREF."audit_trail" - . " (type, trans_no, user, gl_date, description) + . " (type, trans_no, user, gl_date, description, stamp) VALUES(".db_escape($trans_type).", ".db_escape($trans_no)."," . $_SESSION["wa_current_user"]->user . "," - . "'$date',". db_escape($descr). ")"; + . "'$date',". db_escape($descr). ", CURRENT_TIMESTAMP)"; db_query($sql, "Cannot add audit info"); // all audit records beside just inserted one should have gl_seq set to NULL // to avoid need for subqueries (not existing in MySQL 3) all over the code $sql = "UPDATE ".TB_PREF."audit_trail audit LEFT JOIN ".TB_PREF."fiscal_year year ON year.begin<='$date' AND year.end>='$date' SET audit.gl_seq = IF(audit.id=".db_insert_id().", 0, NULL)," - ."audit.fiscal_year=year.id" + ."audit.fiscal_year=year.id, stamp=CURRENT_TIMESTAMP" . " WHERE type=".db_escape($trans_type)." AND trans_no=" . db_escape($trans_no); diff --git a/sales/customer_payments.php b/sales/customer_payments.php index 592d0e7f..f314b988 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -243,6 +243,7 @@ if (get_post('AddPaymentItem') && can_process()) { input_num('amount'), input_num('discount'), $_POST['memo_'], 0, input_num('charge'), input_num('bank_amount', input_num('amount'))); $_SESSION['alloc']->trans_no = $payment_no; + $_SESSION['alloc']->date_ = $_POST['DateBanked']; $_SESSION['alloc']->write(); unset($_SESSION['alloc']); -- 2.30.2