Fixed two typos in translated messages.

[fa-stable.git] / gl / bank_transfer.php

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index b7c7fcc5ef56ded16bb071e9b575b58cf4de588c..5ed84c08e4528c12537c456bc4a9fa94d9ab17ec 100644 (file)
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -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,12 +53,13 @@ if (isset($_POST['_DatePaid_changed'])) {
 
 function gl_payment_controls()
 {
-       global $table_style2;
+       global $Refs;
+       
        $home_currency = get_company_currency();
 
        start_form();
 
-       start_outer_table($table_style2, 5);
+       start_outer_table(TABLESTYLE2);
 
        table_section(1);
 
@@ -85,7 +86,7 @@ function gl_payment_controls()
 
        table_section(2);
 
-    ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_transfer()));
+    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKTRANSFER));
 
     textarea_row(_("Memo:"), 'memo_', null, 40,4);
 
@@ -100,6 +101,8 @@ function gl_payment_controls()
 
 function check_valid_entries()
 {
+       global $Refs;
+       
        if (!is_date($_POST['DatePaid'])) 
        {
                display_error(_("The entered date is invalid."));
@@ -126,14 +129,19 @@ function check_valid_entries()
                set_focus('charge');
                return false;
        }
-       if (!references::is_valid($_POST['ref'])) 
+       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');
@@ -162,21 +170,11 @@ function handle_add_deposit()
 
 //----------------------------------------------------------------------------------------
 
-function safeExit()
-{
-       echo "<br><br>";
-       end_page();
-       exit;
-}
-
-//----------------------------------------------------------------------------------------
-
 if (isset($_POST['AddPayment']))
 {
        if (check_valid_entries() == true) 
        {
                handle_add_deposit();
-               safeExit();
        }
 }