Version changed to 2.0. Final release

[fa-stable.git] / gl / gl_bank.php

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index b035587bff5ba46fb077204fa2ae990391295ce9..d827877d7acec789a7bea4ebcd2065453d1be8de 100644 (file)
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -52,7 +52,9 @@ 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");
+
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter A Deposit"), "NewDeposit=yes");
 
        display_footer_exit();
 }
@@ -66,43 +68,14 @@ 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"));
-
-       display_footer_exit();
-}
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Deposit"), "NewDeposit=yes");
 
-//--------------------------------------------------------------------------------------------------
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter A Payment"), "NewPayment=yes");
 
-function copy_to_py()
-{
-       $_SESSION['pay_items']->from_loc = $_POST['bank_account'];
-       $_SESSION['pay_items']->tran_date = $_POST['date_'];
-       $_SESSION['pay_items']->transfer_type = $_POST['type'];
-       $_SESSION['pay_items']->increase = $_POST['PayType'];
-       if (!isset($_POST['person_id']))
-               $_POST['person_id'] = "";
-       $_SESSION['pay_items']->person_id = $_POST['person_id'];
-       if (!isset($_POST['PersonDetailID']))
-               $_POST['PersonDetailID'] = "";
-       $_SESSION['pay_items']->branch_id = $_POST['PersonDetailID'];
-       $_SESSION['pay_items']->memo_ = $_POST['memo_'];
+       display_footer_exit();
 }
-
 //--------------------------------------------------------------------------------------------------
 
-function copy_from_py()
-{
-       $_POST['bank_account'] = $_SESSION['pay_items']->from_loc;
-       $_POST['date_'] = $_SESSION['pay_items']->tran_date;
-       $_POST['type'] = $_SESSION['pay_items']->transfer_type;
-       $_POST['PayType'] = $_SESSION['pay_items']->increase;
-       $_POST['person_id'] = $_SESSION['pay_items']->person_id;
-       $_POST['PersonDetailID'] = $_SESSION['pay_items']->branch_id;
-       $_POST['memo_'] = $_SESSION['pay_items']->memo_;
-}
-
-//-----------------------------------------------------------------------------------------------
-
 function handle_new_order($type)
 {
        if (isset($_SESSION['pay_items']))
@@ -165,7 +138,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_'],
@@ -178,7 +151,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 */
@@ -242,7 +215,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();
@@ -250,14 +223,8 @@ function handle_new_item()
 
 //-----------------------------------------------------------------------------------------------
 $id = find_submit('Delete');
-if ($id != -1) {
-       copy_from_py();
+if ($id != -1)
        handle_delete_item($id);
-}
-if (isset($_POST['AddItem']) || isset($_POST['UpdateItem'])) {
-       copy_to_py();
-       line_start_focus();
-}
 
 if (isset($_POST['AddItem']))
        handle_new_item();
@@ -265,9 +232,9 @@ if (isset($_POST['AddItem']))
 if (isset($_POST['UpdateItem']))
        handle_update_item();
 
-if (isset($_POST['CancelItemChanges'])) {
+if (isset($_POST['CancelItemChanges']))
        line_start_focus();
-}
+
 
 //-----------------------------------------------------------------------------------------------
 
@@ -278,7 +245,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>";
@@ -286,7 +253,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();