Merging version 2.1 RC to main trunk.

[fa-stable.git] / admin / db / voiding_db.inc

diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc
index 692080e0308515e313eee29dbf43a3dbf9d470d4..fafac43051a38b3ded47f04514dd9b404c166690 100644 (file)
--- a/admin/db/voiding_db.inc
+++ b/admin/db/voiding_db.inc
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
@@ -16,9 +25,7 @@ function void_transaction($type, $type_no, $date_, $memo_)
                case 0 : // it's a journal entry
                        if (!exists_gl_trans($type, $type_no))
                                return false;
-                       void_gl_trans($type, $type_no);
-                       if (exists_bank_trans($type, $type_no))
-                               void_bank_trans($type, $type_no);
+                       void_journal_trans($type, $type_no);
                        break;
 
                case 1 : // it's a payment