X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_bank.php;h=b3b3345cb51b75d3ef6b179953fe23eabed48b66;hb=303eb17e9cdd9702eee9fdfcaee51e654a1da541;hp=34218c6f275b6b59a0730e0395655fee1d16d758;hpb=cf7be1f00c6abe59755286e0c3108d9d3c0356da;p=fa-stable.git diff --git a/gl/gl_bank.php b/gl/gl_bank.php index 34218c6f..b3b3345c 100644 --- a/gl/gl_bank.php +++ b/gl/gl_bank.php @@ -9,10 +9,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 3; -$path_to_root=".."; +$path_to_root = ".."; include_once($path_to_root . "/includes/ui/items_cart.inc"); include_once($path_to_root . "/includes/session.inc"); +$page_security = isset($_GET['NewPayment']) || + @($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT) + ? 'SA_PAYMENT' : 'SA_DEPOSIT'; include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/data_checks.inc"); @@ -28,12 +30,12 @@ if ($use_date_picker) $js .= get_js_date_picker(); if (isset($_GET['NewPayment'])) { - $_SESSION['page_title'] = _("Bank Account Payment Entry"); - handle_new_order(systypes::bank_payment()); + $_SESSION['page_title'] = _($help_context = "Bank Account Payment Entry"); + handle_new_order(ST_BANKPAYMENT); } else if(isset($_GET['NewDeposit'])) { - $_SESSION['page_title'] = _("Bank Account Deposit Entry"); - handle_new_order(systypes::bank_deposit()); + $_SESSION['page_title'] = _($help_context = "Bank Account Deposit Entry"); + handle_new_order(ST_BANKDEPOSIT); } page($_SESSION['page_title'], false, false, '', $js); @@ -60,9 +62,9 @@ function line_start_focus() { if (isset($_GET['AddedID'])) { $trans_no = $_GET['AddedID']; - $trans_type = systypes::bank_payment(); + $trans_type = ST_BANKPAYMENT; - display_notification_centered(_("Payment has been entered")); + display_notification_centered(_("Payment $trans_no has been entered")); display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Postings for this Payment"))); @@ -76,9 +78,9 @@ if (isset($_GET['AddedID'])) if (isset($_GET['AddedDep'])) { $trans_no = $_GET['AddedDep']; - $trans_type = systypes::bank_deposit(); + $trans_type = ST_BANKDEPOSIT; - display_notification_centered(_("Deposit has been entered")); + display_notification_centered(_("Deposit $trans_no has been entered")); display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Postings for this Deposit"))); @@ -100,7 +102,7 @@ function handle_new_order($type) unset ($_SESSION['pay_items']); } - session_register("pay_items"); + //session_register("pay_items"); $_SESSION['pay_items'] = new items_cart($type); @@ -123,7 +125,13 @@ if (isset($_POST['Process'])) $input_error = 1; } - if (!references::is_valid($_POST['ref'])) + if ($_SESSION['pay_items']->gl_items_total() == 0.0) { + display_error(_("The total bank amount cannot be 0.")); + set_focus('code_id'); + $input_error = 1; + } + + if (!$Refs->is_valid($_POST['ref'])) { display_error( _("You must enter a reference.")); set_focus('ref'); @@ -168,7 +176,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==ST_BANKPAYMENT ? "AddedID=$trans_no" : "AddedDep=$trans_no"); } /*end of process credit note */ @@ -193,7 +201,7 @@ function check_item_data() //if (is_bank_account($_POST['code_id'])) //{ - // if ($_SESSION['pay_items']->trans_type == systypes::bank_payment()) + // if ($_SESSION['pay_items']->trans_type == ST_BANKPAYMENT) // display_error( _("You cannot make a payment to a bank account. Please use the transfer funds facility for this.")); // else // display_error( _("You cannot make a deposit from a bank account. Please use the transfer funds facility for this.")); @@ -208,11 +216,11 @@ function check_item_data() function handle_update_item() { - $amount = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 1:-1) * input_num('amount'); + $amount = ($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? 1:-1) * input_num('amount'); if($_POST['UpdateItem'] != "" && check_item_data()) { - $_SESSION['pay_items']->update_gl_item($_POST['Index'], $_POST['dimension_id'], - $_POST['dimension2_id'], $amount , $_POST['LineMemo']); + $_SESSION['pay_items']->update_gl_item($_POST['Index'], $_POST['code_id'], + $_POST['dimension_id'], $_POST['dimension2_id'], $amount , $_POST['LineMemo']); } line_start_focus(); } @@ -231,7 +239,7 @@ function handle_new_item() { if (!check_item_data()) return; - $amount = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 1:-1) * input_num('amount'); + $amount = ($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? 1:-1) * input_num('amount'); $_SESSION['pay_items']->add_gl_item($_POST['code_id'], $_POST['dimension_id'], $_POST['dimension2_id'], $amount, $_POST['LineMemo']); @@ -254,7 +262,7 @@ if (isset($_POST['CancelItemChanges'])) if (isset($_POST['go'])) { display_quick_entries($_SESSION['pay_items'], $_POST['person_id'], input_num('totamount'), - $_SESSION['pay_items']->trans_type==systypes::bank_payment() ? QE_PAYMENT : QE_DEPOSIT); + $_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? QE_PAYMENT : QE_DEPOSIT); $_POST['totamount'] = price_format(0); $Ajax->activate('totamount'); line_start_focus(); } @@ -267,7 +275,7 @@ display_bank_header($_SESSION['pay_items']); start_table("$table_style2 width=90%", 10); start_row(); echo ""; -display_gl_items($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? +display_gl_items($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? _("Payment Items"):_("Deposit Items"), $_SESSION['pay_items']); gl_options_controls(); echo ""; @@ -275,7 +283,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==ST_BANKPAYMENT ? _("Process Payment"):_("Process Deposit"), '', 'default'); end_form();