From: Joe Hunt Date: Fri, 16 Apr 2010 09:42:59 +0000 (+0000) Subject: Minor fixes in voiding transactions X-Git-Tag: v2.4.2~19^2~909 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=e98dad8c105182b946fd58518710d86214f94c91;p=fa-stable.git Minor fixes in voiding transactions --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c13a8fb7..903df7b9 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,10 @@ Legend: ! -> Note $ -> Affected files +16-Apr-2010 Joe Hunt +# Minor fixes in voiding transactions +$ /admin/void_transaction.php + 15-Apr-2010 Joe Hunt ! Added an alternative way of presenting tax included on invoices. This is done by setting a global variabel $alternative_tax_include_on_docs = 1. diff --git a/admin/void_transaction.php b/admin/void_transaction.php index d91c53d0..7eee558c 100644 --- a/admin/void_transaction.php +++ b/admin/void_transaction.php @@ -147,7 +147,7 @@ function voiding_controls() systypes_list_cells(_("Transaction Type:"), 'filterType', null, true); if (list_updated('filterType')) $selected_id = -1; - + end_row(); end_table(1); @@ -173,17 +173,17 @@ function voiding_controls() start_table(TABLESTYLE2); - //systypes_list_row(_("Transaction Type:"), "filterType", null, true); - if ($selected_id != -1) { - $_POST['trans_no'] = $selected_id; + hidden('trans_no', $selected_id); hidden('selected_id', $selected_id); } else - $_POST['trans_no'] = ''; - - text_row(_("Transaction #:"), 'trans_no', null, 12, 12); + { + hidden('trans_no', ''); + $_POST['memo_'] = ''; + } + label_row(_("Transaction #:"), ($selected_id==-1?'':$selected_id)); date_row(_("Voiding Date:"), 'date_');