X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fgl_bank.php;h=0458b15213402f25fe6d3d400290075a8cf6ea03;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=ae5b1daf2b23d5563bc72c8d20cdb9bfcdbbc18e;hpb=4301c9cda0f510cc52335408380b368e51c2a663;p=fa-stable.git diff --git a/gl/gl_bank.php b/gl/gl_bank.php index ae5b1daf..0458b152 100644 --- a/gl/gl_bank.php +++ b/gl/gl_bank.php @@ -1,9 +1,20 @@ . +***********************************************************************/ +$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"); @@ -20,43 +31,24 @@ if ($use_date_picker) if (isset($_GET['NewPayment'])) { $_SESSION['page_title'] = _("Bank Account Payment Entry"); - handle_new_order(systypes::bank_payment()); + handle_new_order(ST_BANKPAYMENT); } else if(isset($_GET['NewDeposit'])) { $_SESSION['page_title'] = _("Bank Account Deposit Entry"); - handle_new_order(systypes::bank_deposit()); + handle_new_order(ST_BANKDEPOSIT); } 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 ($ret = context_restore()) { - if(isset($ret['supplier_id'])) - $_POST['person_id'] = $ret['supplier_id']; - if(isset($ret['customer_id'])) - $_POST['person_id'] = $ret['customer_id']; - set_focus('person_id'); - if(isset($ret['branch_id'])) { - $_POST['PersonDetailID'] = $ret['branch_id']; - set_focus('PersonDetailID'); - } -} -if (isset($_POST['_person_id_editor'])) { - if ($_POST['PayType']==payment_person_types::supplier()) - $editor = '/purchasing/manage/suppliers.php?supplier_id='; - else - $editor = '/sales/manage/customers.php?debtor_no='; - -// $_SESSION['pay_items'] should stay unchanged during call -// -context_call($path_to_root.$editor.$_POST['person_id'], - array('bank_account', 'date_', 'PayType', 'person_id', - 'PersonDetailID', 'type', 'ref', 'memo_') ); +if (list_updated('PersonDetailID')) { + $br = get_branch(get_post('PersonDetailID')); + $_POST['person_id'] = $br['debtor_no']; + $Ajax->activate('person_id'); } + //-------------------------------------------------------------------------------------------------- function line_start_focus() { global $Ajax; @@ -70,7 +62,7 @@ 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")); @@ -86,7 +78,7 @@ 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")); @@ -107,7 +99,6 @@ function handle_new_order($type) { if (isset($_SESSION['pay_items'])) { - $_SESSION['pay_items']->clear_items(); unset ($_SESSION['pay_items']); } @@ -115,7 +106,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,7 +125,7 @@ if (isset($_POST['Process'])) $input_error = 1; } - if (!references::is_valid($_POST['ref'])) + if (!$Refs->is_valid($_POST['ref'])) { display_error( _("You must enter a reference.")); set_focus('ref'); @@ -170,15 +161,16 @@ if (isset($_POST['Process'])) $_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==ST_BANKPAYMENT ? "AddedID=$trans_no" : "AddedDep=$trans_no"); } /*end of process credit note */ @@ -203,7 +195,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.")); @@ -218,7 +210,7 @@ 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'], @@ -241,13 +233,12 @@ 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']); line_start_focus(); } - //----------------------------------------------------------------------------------------------- $id = find_submit('Delete'); if ($id != -1) @@ -264,77 +255,21 @@ if (isset($_POST['CancelItemChanges'])) if (isset($_POST['go'])) { - if (!check_num('totamount', 0)) - { - display_error( _("The amount entered is not a valid number or is less than zero.")); - set_focus('totamount'); - } - elseif (!get_post('person_id')) - { - if ($_SESSION['pay_items']->trans_type==systypes::bank_payment()) - display_error( _("No Quick Entries are defined for Payment.")); - else - display_error( _("No Quick Entries are defined for Deposit.")); - set_focus('totamount'); - } - else - { - $rate = 0; - $totamount = input_num('totamount'); - $totamount = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 1:-1) * $totamount; - $qe = get_quick_entry($_POST['person_id']); - $qe_lines = get_quick_entry_lines($_POST['person_id']); - while ($qe_line = db_fetch($qe_lines)) - { - if ($qe_line['tax_acc']) - { - $account = get_gl_account($qe_line['account']); - $tax_group = $account['tax_code']; - $items = get_tax_group_items($tax_group); - while ($item = db_fetch($items)) - $rate += $item['rate']; - if ($rate != 0) - $totamount = $totamount * 100 / ($rate + 100); - $_SESSION['pay_items']->clear_items(); - - $_SESSION['pay_items']->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'], - $totamount, $qe['description']); - $items = get_tax_group_items($tax_group); - while ($item = db_fetch($items)) - { - if ($item['rate'] != 0) - { - $amount = $totamount * $item['rate'] / 100; - $code = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? $item['purchasing_gl_code'] : - $item['sales_gl_code']); - $_SESSION['pay_items']->add_gl_item($code, 0, 0, $amount, $qe['description']); - } - } - } - else - { - if ($qe_line['pct']) - $amount = $totamount * $qe_line['amount'] / 100; - else - $amount = $qe_line['amount']; - $_SESSION['pay_items']->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'], - $amount, $qe['description']); - } - } - line_start_focus(); - } -} - + display_quick_entries($_SESSION['pay_items'], $_POST['person_id'], input_num('totamount'), + $_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? 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 "