X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_bank.php;h=aff95cb3c9e76c74d96f6fdd564eb81bfeabf9fa;hb=7ba24fed715d41c0210f4395fd885ef34a483d5e;hp=99a0dc335c5eab4831ccc1081d5178156689c9be;hpb=e8623dd6746abb8eec4eb3ddd583d208e531b8e7;p=fa-stable.git diff --git a/gl/gl_bank.php b/gl/gl_bank.php index 99a0dc33..aff95cb3 100644 --- a/gl/gl_bank.php +++ b/gl/gl_bank.php @@ -1,7 +1,16 @@ . +***********************************************************************/ +$page_security = isset($_GET['NewPayment']) ? 'SA_PAYMENT' : 'SA_DEPOSIT'; +$path_to_root = ".."; include_once($path_to_root . "/includes/ui/items_cart.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -31,7 +40,12 @@ page($_SESSION['page_title'], false, false, '', $js); //----------------------------------------------------------------------------------------------- check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); -check_db_has_bank_trans_types(_("There are no bank payment types defined in the system.")); +//---------------------------------------------------------------------------------------- +if (list_updated('PersonDetailID')) { + $br = get_branch(get_post('PersonDetailID')); + $_POST['person_id'] = $br['debtor_no']; + $Ajax->activate('person_id'); +} //-------------------------------------------------------------------------------------------------- function line_start_focus() { @@ -50,9 +64,11 @@ if (isset($_GET['AddedID'])) display_notification_centered(_("Payment has been entered")); - display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Postings for this Payment"))); + display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Postings for this Payment"))); + + hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another &Payment"), "NewPayment=yes"); - hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter Another Payment")); + hyperlink_params($_SERVER['PHP_SELF'], _("Enter A &Deposit"), "NewDeposit=yes"); display_footer_exit(); } @@ -66,17 +82,21 @@ 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"); + + hyperlink_params($_SERVER['PHP_SELF'], _("Enter A Payment"), "NewPayment=yes"); display_footer_exit(); } +if (isset($_POST['_date__changed'])) { + $Ajax->activate('_ex_rate'); +} //-------------------------------------------------------------------------------------------------- function handle_new_order($type) { if (isset($_SESSION['pay_items'])) { - $_SESSION['pay_items']->clear_items(); unset ($_SESSION['pay_items']); } @@ -84,7 +104,7 @@ function handle_new_order($type) $_SESSION['pay_items'] = new items_cart($type); - $_POST['date_'] = Today(); + $_POST['date_'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['date_'])) $_POST['date_'] = end_fiscalyear(); $_SESSION['pay_items']->tran_date = $_POST['date_']; @@ -134,20 +154,21 @@ 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_'], $_POST['PayType'], $_POST['person_id'], get_post('PersonDetailID'), - $_POST['type'], $_POST['ref'], $_POST['memo_']); + $_POST['ref'], $_POST['memo_']); $trans_type = $trans[0]; $trans_no = $trans[1]; + new_doc_date($_POST['date_']); $_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 */ @@ -156,12 +177,12 @@ if (isset($_POST['Process'])) function check_item_data() { - if (!check_num('amount', 0)) - { - display_error( _("The amount entered is not a valid number or is less than zero.")); - set_focus('amount'); - return false; - } + //if (!check_num('amount', 0)) + //{ + // display_error( _("The amount entered is not a valid number or is less than zero.")); + // set_focus('amount'); + // return false; + //} if ($_POST['code_id'] == $_POST['bank_account']) { @@ -170,15 +191,15 @@ function check_item_data() return false; } - if (is_bank_account($_POST['code_id'])) - { - if ($_SESSION['pay_items']->trans_type == systypes::bank_payment()) - 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.")); - set_focus('code_id'); - return false; - } + //if (is_bank_account($_POST['code_id'])) + //{ + // if ($_SESSION['pay_items']->trans_type == systypes::bank_payment()) + // 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.")); + // set_focus('code_id'); + // return false; + //} return true; } @@ -211,12 +232,11 @@ 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(); } - //----------------------------------------------------------------------------------------------- $id = find_submit('Delete'); if ($id != -1) @@ -228,20 +248,26 @@ if (isset($_POST['AddItem'])) if (isset($_POST['UpdateItem'])) handle_update_item(); -if (isset($_POST['CancelItemChanges'])) +if (isset($_POST['CancelItemChanges'])) line_start_focus(); - +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); + $_POST['totamount'] = price_format(0); $Ajax->activate('totamount'); + line_start_focus(); +} //----------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); 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==systypes::bank_payment() ? _("Payment Items"):_("Deposit Items"), $_SESSION['pay_items']); gl_options_controls(); echo ""; @@ -249,8 +275,8 @@ end_row(); end_table(1); submit_center_first('Update', _("Update"), '', null); -submit_center_last('Process', $_SESSION['pay_items']->trans_type==systypes::bank_payment() ? - _("Process Payment"):_("Process Deposit"), '', true); +submit_center_last('Process', $_SESSION['pay_items']->trans_type==systypes::bank_payment() ? + _("Process Payment"):_("Process Deposit"), '', 'default'); end_form();