X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_bank.php;h=2d44653179c3e0e72c54c914a610f727a0663081;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=b3f1c1b7766f0f5871371ecf47d4f817346734a7;hpb=45e45a854c40a7a2f9cc8f11e07a259c6923babd;p=fa-stable.git diff --git a/gl/gl_bank.php b/gl/gl_bank.php index b3f1c1b7..2d446531 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"); @@ -11,56 +22,53 @@ include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/gl/includes/ui/gl_bank_ui.inc"); include_once($path_to_root . "/gl/includes/gl_db.inc"); include_once($path_to_root . "/gl/includes/gl_ui.inc"); +include_once($path_to_root . "/admin/db/attachments_db.inc"); $js = ''; -if ($use_popup_windows) +if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(800, 500); -if ($use_date_picker) +if (user_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"); + create_cart(ST_BANKPAYMENT, 0); } 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"); + create_cart(ST_BANKDEPOSIT, 0); +} else if(isset($_GET['ModifyPayment'])) { + $_SESSION['page_title'] = _($help_context = "Modify Bank Account Entry")." #".$_GET['trans_no']; + create_cart(ST_BANKPAYMENT, $_GET['trans_no']); +} else if(isset($_GET['ModifyDeposit'])) { + $_SESSION['page_title'] = _($help_context = "Modify Bank Deposit Entry")." #".$_GET['trans_no']; + create_cart(ST_BANKDEPOSIT, $_GET['trans_no']); } page($_SESSION['page_title'], false, false, '', $js); //----------------------------------------------------------------------------------------------- check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); +if (isset($_GET['ModifyDeposit']) || isset($_GET['ModifyPayment'])) + check_is_editable($_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id); + //---------------------------------------------------------------------------------------- -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', '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; - - $Ajax->activate('items_table'); - set_focus('_code_id_edit'); + global $Ajax; + + unset($_POST['amount']); + unset($_POST['dimension_id']); + unset($_POST['dimension2_id']); + unset($_POST['LineMemo']); + $Ajax->activate('items_table'); + $Ajax->activate('footer'); + set_focus('_code_id_edit'); } //----------------------------------------------------------------------------------------------- @@ -68,9 +76,27 @@ function line_start_focus() { if (isset($_GET['AddedID'])) { $trans_no = $_GET['AddedID']; - $trans_type = systypes::bank_payment(); + $trans_type = ST_BANKPAYMENT; + + display_notification_centered(sprintf(_("Payment %d has been entered"), $trans_no)); + + display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Postings for this Payment"))); - display_notification_centered(_("Payment has been entered")); + hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another &Payment"), "NewPayment=yes"); + + hyperlink_params($_SERVER['PHP_SELF'], _("Enter A &Deposit"), "NewDeposit=yes"); + + hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$trans_no"); + + display_footer_exit(); +} + +if (isset($_GET['UpdatedID'])) +{ + $trans_no = $_GET['UpdatedID']; + $trans_type = ST_BANKPAYMENT; + + display_notification_centered(sprintf(_("Payment %d has been modified"), $trans_no)); display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Postings for this Payment"))); @@ -84,9 +110,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(sprintf(_("Deposit %d has been entered"), $trans_no)); display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Postings for this Deposit"))); @@ -96,33 +122,101 @@ if (isset($_GET['AddedDep'])) display_footer_exit(); } -if (isset($_POST['_date__changed'])) { - $Ajax->activate('_ex_rate'); +if (isset($_GET['UpdatedDep'])) +{ + $trans_no = $_GET['UpdatedDep']; + $trans_type = ST_BANKDEPOSIT; + + display_notification_centered(sprintf(_("Deposit %d has been modified"), $trans_no)); + + display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Postings for this Deposit"))); + + hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another &Deposit"), "NewDeposit=yes"); + + hyperlink_params($_SERVER['PHP_SELF'], _("Enter A &Payment"), "NewPayment=yes"); + + display_footer_exit(); } + //-------------------------------------------------------------------------------------------------- -function handle_new_order($type) +function create_cart($type, $trans_no) { + global $Refs; + if (isset($_SESSION['pay_items'])) { - $_SESSION['pay_items']->clear_items(); unset ($_SESSION['pay_items']); } - session_register("pay_items"); + $cart = new items_cart($type); + $cart->order_id = $trans_no; - $_SESSION['pay_items'] = new items_cart($type); + if ($trans_no) { - $_POST['date_'] = Today(); - if (!is_date_in_fiscalyear($_POST['date_'])) - $_POST['date_'] = end_fiscalyear(); - $_SESSION['pay_items']->tran_date = $_POST['date_']; -} + $bank_trans = db_fetch(get_bank_trans($type, $trans_no)); + $_POST['bank_account'] = $bank_trans["bank_act"]; + $_POST['PayType'] = $bank_trans["person_type_id"]; + $cart->reference = $bank_trans["ref"]; + + if ($bank_trans["person_type_id"] == PT_CUSTOMER) + { + $trans = get_customer_trans($trans_no, $type); + $_POST['person_id'] = $trans["debtor_no"]; + $_POST['PersonDetailID'] = $trans["branch_code"]; + } + elseif ($bank_trans["person_type_id"] == PT_SUPPLIER) + { + $trans = get_supp_trans($trans_no, $type); + $_POST['person_id'] = $trans["supplier_id"]; + } + elseif ($bank_trans["person_type_id"] == PT_MISC) + $_POST['person_id'] = $bank_trans["person_id"]; + elseif ($bank_trans["person_type_id"] == PT_QUICKENTRY) + $_POST['person_id'] = $bank_trans["person_id"]; + else + $_POST['person_id'] = $bank_trans["person_id"]; + + $cart->memo_ = get_comments_string($type, $trans_no); + $cart->tran_date = sql2date($bank_trans['trans_date']); + + $cart->original_amount = $bank_trans['amount']; + $result = get_gl_trans($type, $trans_no); + if ($result) { + while ($row = db_fetch($result)) { + if (is_bank_account($row['account'])) { + // date exchange rate is currenly not stored in bank transaction, + // so we have to restore it from original gl amounts + $ex_rate = $bank_trans['amount']/$row['amount']; + } else { + $cart->add_gl_item( $row['account'], $row['dimension_id'], + $row['dimension2_id'], $row['amount'], $row['memo_']); + } + } + } + + // apply exchange rate + foreach($cart->gl_items as $line_no => $line) + $cart->gl_items[$line_no]->amount *= $ex_rate; + + } else { + $cart->reference = $Refs->get_next($cart->trans_type, null, $cart->tran_date); + $cart->tran_date = new_doc_date(); + if (!is_date_in_fiscalyear($cart->tran_date)) + $cart->tran_date = end_fiscalyear(); + } + + $_POST['memo_'] = $cart->memo_; + $_POST['ref'] = $cart->reference; + $_POST['date_'] = $cart->tran_date; + $_SESSION['pay_items'] = &$cart; +} //----------------------------------------------------------------------------------------------- -if (isset($_POST['Process'])) +function check_trans() { + global $Refs; $input_error = 0; @@ -132,15 +226,31 @@ 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; + } + + $limit = get_bank_account_limit($_POST['bank_account'], $_POST['date_']); + + $amnt_chg = -$_SESSION['pay_items']->gl_items_total()-$_SESSION['pay_items']->original_amount; + + if ($limit !== null && floatcmp($limit, -$amnt_chg) < 0) { - display_error( _("You must enter a reference.")); - set_focus('ref'); + display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit-$_SESSION['pay_items']->original_amount))); + set_focus('code_id'); + $input_error = 1; + } + if ($trans = check_bank_account_history($amnt_chg, $_POST['bank_account'], $_POST['date_'])) { + + display_error(sprintf(_("The bank transaction would result in exceed of authorized overdraft limit for transaction: %s #%s on %s."), + $systypes_array[$trans['type']], $trans['trans_no'], sql2date($trans['trans_date']))); + set_focus('amount'); $input_error = 1; } - elseif (!is_new_reference($_POST['ref'], $_SESSION['pay_items']->trans_type)) + if (!check_reference($_POST['ref'], $_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id)) { - display_error( _("The entered reference is already in use.")); set_focus('ref'); $input_error = 1; } @@ -152,75 +262,93 @@ if (isset($_POST['Process'])) } elseif (!is_date_in_fiscalyear($_POST['date_'])) { - display_error(_("The entered date is not in fiscal year.")); + display_error(_("The entered date is out of fiscal year or is closed for further data entry.")); set_focus('date_'); $input_error = 1; + } + + if (get_post('PayType')==PT_CUSTOMER && (!get_post('person_id') || !get_post('PersonDetailID'))) { + display_error(_("You have to select customer and customer branch.")); + set_focus('person_id'); + $input_error = 1; + } elseif (get_post('PayType')==PT_SUPPLIER && (!get_post('person_id'))) { + display_error(_("You have to select supplier.")); + set_focus('person_id'); + $input_error = 1; } + if (!db_has_currency_rates(get_bank_account_currency($_POST['bank_account']), $_POST['date_'], true)) + $input_error = 1; - if ($input_error == 1) - unset($_POST['Process']); + if (isset($_POST['settled_amount']) && in_array(get_post('PayType'), array(PT_SUPPLIER, PT_CUSTOMER)) && (input_num('settled_amount') <= 0)) { + display_error(_("Settled amount have to be positive number.")); + set_focus('person_id'); + $input_error = 1; + } + return $input_error; } -if (isset($_POST['Process'])) +if (isset($_POST['Process']) && !check_trans()) { + begin_transaction(); + + $_SESSION['pay_items'] = &$_SESSION['pay_items']; + $new = $_SESSION['pay_items']->order_id == 0; + + add_new_exchange_rate(get_bank_account_currency(get_post('bank_account')), get_post('date_'), input_num('_ex_rate')); - $trans = add_bank_transaction( - $_SESSION['pay_items']->trans_type, $_POST['bank_account'], + $trans = write_bank_transaction( + $_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id, $_POST['bank_account'], $_SESSION['pay_items'], $_POST['date_'], $_POST['PayType'], $_POST['person_id'], get_post('PersonDetailID'), - $_POST['ref'], $_POST['memo_']); + $_POST['ref'], $_POST['memo_'], true, input_num('settled_amount', null)); $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() ? - "AddedID=$trans_no" : "AddedDep=$trans_no"); + commit_transaction(); -} /*end of process credit note */ + if ($new) + meta_forward($_SERVER['PHP_SELF'], $trans_type==ST_BANKPAYMENT ? + "AddedID=$trans_no" : "AddedDep=$trans_no"); + else + meta_forward($_SERVER['PHP_SELF'], $trans_type==ST_BANKPAYMENT ? + "UpdatedID=$trans_no" : "UpdatedDep=$trans_no"); + +} //----------------------------------------------------------------------------------------------- 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 ($_POST['code_id'] == $_POST['bank_account']) + if (!check_num('amount', 0)) { - display_error( _("The source and destination accouts cannot be the same.")); - set_focus('code_id'); + display_error( _("The amount entered is not a valid number or is less than zero.")); + set_focus('amount'); + return false; + } + if (isset($_POST['_ex_rate']) && input_num('_ex_rate') <= 0) + { + display_error( _("The exchange rate cannot be zero or a negative number.")); + set_focus('_ex_rate'); 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; + return true; } //----------------------------------------------------------------------------------------------- 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(); } @@ -239,13 +367,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) @@ -257,91 +384,35 @@ if (isset($_POST['AddItem'])) if (isset($_POST['UpdateItem'])) handle_update_item(); -if (isset($_POST['CancelItemChanges'])) +if (isset($_POST['CancelItemChanges']) || isset($_POST['Index'])) line_start_focus(); 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_table(TABLESTYLE2, "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(); +gl_options_controls($_SESSION['pay_items']); echo ""; 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==ST_BANKPAYMENT ? + _("Process Payment"):_("Process Deposit"), '', 'default'); end_form(); @@ -349,4 +420,3 @@ end_form(); end_page(); -?>