Merged changes form stabel branch up to the current state (2.3.22+).

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

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 7e293af1544fcb69624cd12bb9f2af817f8e58b9..e56726f5eb005da7337e7ceec68b5ac59e31ad2c 100644 (file)
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -69,7 +69,16 @@ function gl_payment_controls()
 
     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']);
@@ -78,7 +87,7 @@ function gl_payment_controls()
                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 
        {
@@ -86,10 +95,6 @@ function gl_payment_controls()
                amount_row(_("Bank Charge:"), 'charge');
        }
 
-       table_section(2);
-
-    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKTRANSFER));
-
     textarea_row(_("Memo:"), 'memo_', null, 40,4);
 
        end_outer_table(1); // outer table
@@ -134,7 +139,7 @@ function check_valid_entries()
 
        $amnt_tr = input_num('charge') + input_num('amount');
 
-       if ($limit != null && ($limit < $amnt_tr))
+       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');
@@ -154,7 +159,7 @@ function check_valid_entries()
                set_focus('charge');
                return false;
        }
-       if (isset($_POST['charge']) && input_num('charge') > 0 && get_company_pref('bank_charge_act') == '') {
+       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;
@@ -180,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;
 }
 
@@ -187,8 +210,9 @@ 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_'], input_num('charge'));
+               $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_'], input_num('charge'), input_num('target_amount'));
 
        meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
 }