X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=d08952e2ad4c8e1de51cf0a7013514ae1abd2494;hb=d5618f84e921515fa6ce6ec05180f0651119c297;hp=c390f7a09e91fcbfaea936046d2d51443b932921;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php index c390f7a0..d08952e2 100644 --- a/gl/bank_transfer.php +++ b/gl/bank_transfer.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$path_to_root=".."; -$page_security = 5; +$page_security = 'SA_BANKTRANSFER'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); @@ -25,7 +25,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Transfer between Bank Accounts"), false, false, "", $js); +page(_($help_context = "Transfer between Bank Accounts"), false, false, "", $js); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); @@ -34,7 +34,7 @@ check_db_has_bank_accounts(_("There are no bank accounts 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")); @@ -42,7 +42,7 @@ if (isset($_GET['AddedID'])) hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Transfer")); - safeExit(); + display_footer_exit(); } if (isset($_POST['_DatePaid_changed'])) { @@ -53,48 +53,53 @@ if (isset($_POST['_DatePaid_changed'])) { function gl_payment_controls() { - global $table_style2; + global $Refs; + $home_currency = get_company_currency(); - start_form(false, true); + start_form(); - start_table($table_style2, 5, 7); - echo ""; // outer table + start_outer_table(TABLESTYLE2); + + 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)); + + 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 ""; - - 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); + submit_center('AddPayment',_("Enter Transfer"), true, '', 'default'); end_form(); } @@ -103,6 +108,8 @@ function gl_payment_controls() function check_valid_entries() { + global $Refs; + if (!is_date($_POST['DatePaid'])) { display_error(_("The entered date is invalid.")); @@ -122,15 +129,49 @@ 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'])) + $limit = get_bank_account_limit($_POST['FromBankAccount'], $_POST['DatePaid']); + + $amnt_tr = input_num('charge') + input_num('amount'); + + if ($limit !== null && floatcmp($limit, $amnt_tr) < 0) + { + display_error(sprintf(_("The total bank amount exceeds allowed limit (%s) for source account."), price_format($limit))); + set_focus('amount'); + return false; + } + if ($trans = check_bank_account_history(-$amnt_tr, $_POST['FromBankAccount'], $_POST['DatePaid'])) { + + 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; + } + + if (isset($_POST['charge']) && !check_num('charge', 0)) + { + 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_company_pref('bank_charge_act') == '') { + display_error(_("The Bank Charge Account has not been set in System and General GL Setup.")); + set_focus('charge'); + return false; + } + if (!$Refs->is_valid($_POST['ref'])) { display_error(_("You must enter a reference.")); set_focus('ref'); return false; } - if (!is_new_reference($_POST['ref'], systypes::bank_transfer())) + if (!is_new_reference($_POST['ref'], ST_BANKTRANSFER)) { display_error(_("The entered reference is already in use.")); set_focus('ref'); @@ -144,6 +185,24 @@ 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; } @@ -151,29 +210,20 @@ function check_valid_entries() function handle_add_deposit() { + new_doc_date($_POST['DatePaid']); $trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'], - $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_']); + $_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() -{ - echo "

"; - end_page(); - exit; -} - -//---------------------------------------------------------------------------------------- - if (isset($_POST['AddPayment'])) { if (check_valid_entries() == true) { handle_add_deposit(); - safeExit(); } }