X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=79195b5c99b6df06467232aa987338c6440c6314;hb=5a3cbfe6d2df1c8c32edcab8bf93e8a8432a15fc;hp=78089f5a4db6f59b56a0d5a128042c4bf1ff48c8;hpb=3334987c69e546f973dac393a72f10702d9e73b8;p=fa-stable.git diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php index 78089f5a..79195b5c 100644 --- a/gl/bank_transfer.php +++ b/gl/bank_transfer.php @@ -1,7 +1,16 @@ . +***********************************************************************/ +$page_security = 'SA_BANKTRANSFER'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); @@ -12,29 +21,35 @@ include_once($path_to_root . "/gl/includes/gl_db.inc"); include_once($path_to_root . "/gl/includes/gl_ui.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(); -page(_("Transfer between Bank Accounts"), false, false, "", $js); + +if (isset($_GET['ModifyTransfer'])) { + $_SESSION['page_title'] = _($help_context = "Modify Bank Account Transfer"); +} else { + $_SESSION['page_title'] = _($help_context = "Bank Account Transfer Entry"); +} + +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 transfer types defined in the system.")); //---------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) { $trans_no = $_GET['AddedID']; - $trans_type = systypes::bank_transfer(); + $trans_type = ST_BANKTRANSFER; display_notification_centered( _("Transfer has been entered")); - display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Journal Entries for this Transfer"))); + display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Journal Entries for this Transfer"))); - hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter Another Transfer")); + hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Transfer")); - safeExit(); + display_footer_exit(); } if (isset($_POST['_DatePaid_changed'])) { @@ -43,60 +58,102 @@ if (isset($_POST['_DatePaid_changed'])) { //---------------------------------------------------------------------------------------- -function gl_payment_controls() +function gl_payment_controls($trans_no) { - global $table_style2; - $home_currency = get_company_currency(); + global $Refs; + + if (!in_ajax()) { + if ($trans_no) { + $result = get_bank_trans(ST_BANKTRANSFER, $trans_no); + + if (db_num_rows($result) != 2) + display_db_error("Bank transfer does not contain two records"); + + $trans1 = db_fetch($result); + $trans2 = db_fetch($result); + + if ($trans1["amount"] < 0) { + $from_trans = $trans1; // from trans is the negative one + $to_trans = $trans2; + } else { + $from_trans = $trans2; + $to_trans = $trans1; + } + $_POST['DatePaid'] = sql2date($to_trans['trans_date']); + $_POST['ref'] = $to_trans['ref']; + $_POST['memo_'] = get_comments_string($to_trans['type'], $trans_no); + $_POST['FromBankAccount'] = $from_trans['bank_act']; + $_POST['ToBankAccount'] = $to_trans['bank_act']; + $_POST['target_amount'] = price_format($to_trans['amount']); + $_POST['amount'] = price_format(-$from_trans['amount']); + } else { + $_POST['ref'] = $Refs->get_next(ST_BANKTRANSFER, null, get_post('DatePaid')); + $_POST['memo_'] = ''; + $_POST['FromBankAccount'] = 0; + $_POST['ToBankAccount'] = 0; + $_POST['amount'] = 0; + } + } + + start_form(); - start_form(false, true); + start_outer_table(TABLESTYLE2); - start_table($table_style2, 5, 7); - echo ""; // outer table + table_section(1); - echo ""; bank_accounts_list_row(_("From Account:"), 'FromBankAccount', null, true); + bank_balance_row($_POST['FromBankAccount']); + bank_accounts_list_row(_("To Account:"), 'ToBankAccount', null, true); - date_row(_("Transfer Date:"), 'DatePaid', '', null, 0, 0, 0, null, true); + if (!isset($_POST['DatePaid'])) { // init page + $_POST['DatePaid'] = new_doc_date(); + if (!is_date_in_fiscalyear($_POST['DatePaid'])) + $_POST['DatePaid'] = end_fiscalyear(); + } + date_row(_("Transfer Date:"), 'DatePaid', '', true, 0, 0, 0, null, true); + + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKTRANSFER, null, get_post('DatePaid')), false, ST_BANKTRANSFER, + array('date' => get_post('DatePaid'))); + + table_section(2); $from_currency = get_bank_account_currency($_POST['FromBankAccount']); $to_currency = get_bank_account_currency($_POST['ToBankAccount']); if ($from_currency != "" && $to_currency != "" && $from_currency != $to_currency) { amount_row(_("Amount:"), 'amount', null, null, $from_currency); + amount_row(_("Bank Charge:"), 'charge', null, null, $from_currency); - exchange_rate_display($from_currency, $to_currency, $_POST['DatePaid']); + amount_row(_("Incoming Amount:"), 'target_amount', null, '', $to_currency, 2); } else { amount_row(_("Amount:"), 'amount'); + amount_row(_("Bank Charge:"), 'charge'); } - echo "
"; - echo ""; // outer table - echo ""; - - bank_trans_types_list_row(_("Transfer Type:"), 'TransferType', null); - - ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_transfer())); - textarea_row(_("Memo:"), 'memo_', null, 40,4); - end_table(1); - - echo ""; - end_table(1); // outer table + end_outer_table(1); // outer table - submit_center('AddPayment',_("Enter Transfer"), true, '', true); + if ($trans_no) { + hidden('_trans_no', $trans_no); + submit_center('submit', _("Modify Transfer"), true, '', 'default'); + } else { + submit_center('submit', _("Enter Transfer"), true, '', 'default'); + } end_form(); } //---------------------------------------------------------------------------------------- -function check_valid_entries() +function check_valid_entries($trans_no) { + global $Refs, $systypes_array; + if (!is_date($_POST['DatePaid'])) { display_error(_("The entered date is invalid.")); @@ -105,7 +162,7 @@ function check_valid_entries() } if (!is_date_in_fiscalyear($_POST['DatePaid'])) { - 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('DatePaid'); return false; } @@ -116,17 +173,67 @@ function check_valid_entries() set_focus('amount'); return false; } + if (input_num('amount') == 0) { + display_error(_("The total bank amount cannot be 0.")); + set_focus('amount'); + return false; + } - if (!references::is_valid($_POST['ref'])) - { - display_error(_("You must enter a reference.")); - set_focus('ref'); + $limit = get_bank_account_limit($_POST['FromBankAccount'], $_POST['DatePaid']); + + $amnt_tr = input_num('charge') + input_num('amount'); + + if ($trans_no) { + $problemTransaction = check_bank_transfer( $trans_no, $_POST['FromBankAccount'], $_POST['ToBankAccount'], $_POST['DatePaid'], + $amnt_tr, input_num('target_amount', $amnt_tr)); + + if ($problemTransaction != null ) { + if (!array_key_exists('trans_no', $problemTransaction)) { + display_error(sprintf( + _("This bank transfer change would result in exceeding authorized overdraft limit (%s) of the account '%s'"), + price_format(-$problemTransaction['amount']), $problemTransaction['bank_account_name'] + )); + } else { + display_error(sprintf( + _("This bank transfer change would result in exceeding authorized overdraft limit on '%s' for transaction: %s #%s on %s."), + $problemTransaction['bank_account_name'], $systypes_array[$problemTransaction['type']], + $problemTransaction['trans_no'], sql2date($problemTransaction['trans_date']) + )); + } + set_focus('amount'); return false; + } + } else { + if (null != ($problemTransaction = check_bank_account_history(-$amnt_tr, $_POST['FromBankAccount'], $_POST['DatePaid']))) { + if (!array_key_exists('trans_no', $problemTransaction)) { + display_error(sprintf( + _("This bank transfer would result in exceeding authorized overdraft limit of the account (%s)"), + price_format(-$problemTransaction['amount']) + )); + } else { + display_error(sprintf( + _("This bank transfer would result in exceeding authorized overdraft limit for transaction: %s #%s on %s."), + $systypes_array[$problemTransaction['type']], $problemTransaction['trans_no'], sql2date($problemTransaction['trans_date']) + )); + } + set_focus('amount'); + return false; + } } - if (!is_new_reference($_POST['ref'], systypes::bank_transfer())) + if (isset($_POST['charge']) && !check_num('charge', 0)) { - display_error(_("The entered reference is already in use.")); + display_error(_("The entered amount is invalid or less than zero.")); + set_focus('charge'); + return false; + } + if (isset($_POST['charge']) && input_num('charge') > 0 && get_bank_charge_account($_POST['FromBankAccount']) == '') { + display_error(_("The Bank Charge Account has not been set in System and General GL Setup.")); + set_focus('charge'); + return false; + } + + if (!check_reference($_POST['ref'], ST_BANKTRANSFER, $trans_no)) { set_focus('ref'); return false; } @@ -138,44 +245,58 @@ function check_valid_entries() return false; } + if (isset($_POST['target_amount']) && !check_num('target_amount', 0)) + { + display_error(_("The entered amount is invalid or less than zero.")); + set_focus('target_amount'); + return false; + } + if (isset($_POST['target_amount']) && input_num('target_amount') == 0) { + display_error(_("The incomming bank amount cannot be 0.")); + set_focus('target_amount'); + return false; + } + + if (!db_has_currency_rates(get_bank_account_currency($_POST['FromBankAccount']), $_POST['DatePaid'])) + return false; + + if (!db_has_currency_rates(get_bank_account_currency($_POST['ToBankAccount']), $_POST['DatePaid'])) + return false; + return true; } //---------------------------------------------------------------------------------------- -function handle_add_deposit() +function bank_transfer_handle_submit() { - global $path_to_root; - - $trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'], - $_POST['DatePaid'], input_num('amount'), - $_POST['TransferType'], $_POST['ref'], $_POST['memo_']); + $trans_no = array_key_exists('_trans_no', $_POST) ? $_POST['_trans_no'] : null; + if ($trans_no) { + $trans_no = update_bank_transfer($trans_no, $_POST['FromBankAccount'], $_POST['ToBankAccount'], $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_'], input_num('charge'), input_num('target_amount')); + } else { + new_doc_date($_POST['DatePaid']); + $trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'], $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_'], input_num('charge'), input_num('target_amount')); + } meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no"); } //---------------------------------------------------------------------------------------- -function safeExit() -{ - global $path_to_root; - echo "

"; - end_page(); - exit; +$trans_no = ''; +if (!$trans_no && isset($_POST['_trans_no'])) { + $trans_no = $_POST['_trans_no']; +} +if (!$trans_no && isset($_GET['trans_no'])) { + $trans_no = $_GET["trans_no"]; } -//---------------------------------------------------------------------------------------- - -if (isset($_POST['AddPayment'])) -{ - if (check_valid_entries() == true) - { - handle_add_deposit(); - safeExit(); +if (isset($_POST['submit'])) { + if (check_valid_entries($trans_no) == true) { + bank_transfer_handle_submit(); } } -gl_payment_controls(); +gl_payment_controls($trans_no); end_page(); -?>