Increment reference bug in GL Deposit and missing hyperlink parameter.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e528d7d8b37bf09efd3aa255237cc1446b1d56d0..1807e6e8a17d983a136ef8762cf6cbeba79fc9cf 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+23-Jul-2008 Joe Hunt
+# Increment reference bug in GL Deposit and missing hyperlink parameter.
+$ /gl/gl_bank.php
+  /gl/includes/gl_bank_ui.inc
+  
 22-Jul-2008 Janusz Dobrowolski
 # Corrected backup maintenance page display during script download.
 $ /admin/backups.php

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 99a0dc335c5eab4831ccc1081d5178156689c9be..51944291d9b07c9351f421edb956e6f1a50858d1 100644 (file)
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -52,7 +52,7 @@ if (isset($_GET['AddedID']))
 
        display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Postings for this Payment")));
 
-       hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter Another Payment"));
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Payment"), "NewPayment=yes");
 
        display_footer_exit();
 }
@@ -66,7 +66,7 @@ if (isset($_GET['AddedDep']))
 
        display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Postings for this Deposit")));
 
-       hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter Another Deposit"));
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Deposit"), "NewDeposit=yes");
 
        display_footer_exit();
 }
@@ -134,7 +134,7 @@ if (isset($_POST['Process']))
 
 if (isset($_POST['Process']))
 {
-       
+
        $trans = add_bank_transaction(
                $_SESSION['pay_items']->trans_type, $_POST['bank_account'],
                $_SESSION['pay_items'], $_POST['date_'],
@@ -147,7 +147,7 @@ if (isset($_POST['Process']))
        $_SESSION['pay_items']->clear_items();
        unset($_SESSION['pay_items']);
 
-       meta_forward($_SERVER['PHP_SELF'], $trans_type==systypes::bank_payment() ? 
+       meta_forward($_SERVER['PHP_SELF'], $trans_type==systypes::bank_payment() ?
                "AddedID=$trans_no" : "AddedDep=$trans_no");
 
 } /*end of process credit note */
@@ -211,7 +211,7 @@ function handle_new_item()
        if (!check_item_data())
                return;
        $amount = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 1:-1) * input_num('amount');
- 
+
        $_SESSION['pay_items']->add_gl_item($_POST['code_id'], $_POST['dimension_id'],
                $_POST['dimension2_id'], $amount, $_POST['LineMemo']);
        line_start_focus();
@@ -228,7 +228,7 @@ if (isset($_POST['AddItem']))
 if (isset($_POST['UpdateItem']))
        handle_update_item();
 
-if (isset($_POST['CancelItemChanges'])) 
+if (isset($_POST['CancelItemChanges']))
        line_start_focus();
 
 
@@ -241,7 +241,7 @@ display_bank_header($_SESSION['pay_items']);
 start_table("$table_style2 width=90%", 10);
 start_row();
 echo "<td>";
-display_gl_items($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 
+display_gl_items($_SESSION['pay_items']->trans_type==systypes::bank_payment() ?
        _("Payment Items"):_("Deposit Items"), $_SESSION['pay_items']);
 gl_options_controls();
 echo "</td>";
@@ -249,7 +249,7 @@ end_row();
 end_table(1);
 
 submit_center_first('Update', _("Update"), '', null);
-submit_center_last('Process', $_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 
+submit_center_last('Process', $_SESSION['pay_items']->trans_type==systypes::bank_payment() ?
        _("Process Payment"):_("Process Deposit"), '', true);
 
 end_form();

diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index d55d7e2f24932b36e8a28f1ccd5fb47870f4da2f..3ea9b9d95229553ea4658ac1967353c0e930c7a0 100644 (file)
--- a/gl/includes/ui/gl_bank_ui.inc
+++ b/gl/includes/ui/gl_bank_ui.inc
@@ -85,7 +85,10 @@ function display_bank_header(&$order)
 
        bank_trans_types_list_row(_("Type:"), 'type', null);
 
-    ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_payment()));
+       if (isset($_GET['NewPayment']))
+       ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_payment()));
+    else
+       ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_deposit()));
 
        echo "</table>"; // inner table
 
@@ -212,7 +215,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
                elseif ($_POST['PayType'] == payment_person_types::WorkOrder())
                        $_POST['code_id'] = get_company_pref('default_assembly_act');
                else {
-                       $_POST['code_id'] = 
+                       $_POST['code_id'] =
                                get_company_pref($payment ? 'default_cogs_act':'default_inv_sales_act');
                }
                gl_all_accounts_list('code_id', null, true, false, true);