Merged changes from master branch up to current state.

[fa-stable.git] / admin / void_transaction.php

diff --git a/admin/void_transaction.php b/admin/void_transaction.php
index 110516072153c1e09b54562f54c022a5177dd508..af44b391851207ef62e7c19792141c12f1e65b5f 100644 (file)
--- a/admin/void_transaction.php
+++ b/admin/void_transaction.php
@@ -283,10 +283,10 @@ function handle_void_transaction()
                        return;
                }
 
-               $ret = void_transaction($_POST['filterType'], $_POST['trans_no'],
+               $msg = void_transaction($_POST['filterType'], $_POST['trans_no'],
                        $_POST['date_'], $_POST['memo_']);
 
-               if ($ret) 
+               if (!$msg) 
                {
                        display_notification_centered(_("Selected transaction has been voided."));
                        unset($_POST['trans_no']);
@@ -294,7 +294,7 @@ function handle_void_transaction()
                        unset($_POST['date_']);
                }
                else {
-                       display_error(_("The entered transaction does not exist or cannot be voided."));
+                       display_error($msg);
                        set_focus('trans_no');
 
                }