From d907208297556310cc7c51fcb9086869c880ab2d Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sat, 14 Aug 2021 21:07:28 +0200 Subject: [PATCH] Unable to void a sales invoice. Fixed by @BraaathWaate. --- sales/includes/db/sales_invoice_db.inc | 3 ++- sales/includes/db/sales_order_db.inc | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc index b1cbfa3f..cbafbccc 100644 --- a/sales/includes/db/sales_invoice_db.inc +++ b/sales/includes/db/sales_invoice_db.inc @@ -249,8 +249,9 @@ function void_sales_invoice($type, $type_no) if ($deliveries !== 0) { if ($type == ST_SALESINVOICE && count($deliveries) == 1 && get_reference(ST_CUSTDELIVERY, $deliveries[0]) == "auto") { + $trans = get_customer_trans($deliveries[0], ST_CUSTDELIVERY); void_sales_delivery(ST_CUSTDELIVERY, $deliveries[0], false); - $date_ = Today(); + $date_ = sql2date($trans['tran_date']); add_audit_trail(ST_CUSTDELIVERY, $deliveries[0], $date_, _("Voided.")); add_voided_entry(ST_CUSTDELIVERY, $deliveries[0], $date_, ""); } diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc index dcf69e93..9d43fb3a 100644 --- a/sales/includes/db/sales_order_db.inc +++ b/sales/includes/db/sales_order_db.inc @@ -89,6 +89,8 @@ function delete_sales_order($order_no, $trans_type) begin_transaction(); hook_db_prevoid($trans_type, $order_no); + $order = get_sales_order_header($order_no, $trans_type); + $sql = "DELETE FROM ".TB_PREF."sales_orders WHERE order_no=" . db_escape($order_no) . " AND trans_type=".db_escape($trans_type); @@ -98,7 +100,7 @@ function delete_sales_order($order_no, $trans_type) .db_escape($order_no) . " AND trans_type=".db_escape($trans_type); db_query($sql, "order Detail Delete"); - add_audit_trail($trans_type, $order_no, Today(), _("Deleted.")); + add_audit_trail($trans_type, $order_no, sql2date($order['ord_date']), _("Deleted.")); commit_transaction(); } -- 2.30.2