X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=d08952e2ad4c8e1de51cf0a7013514ae1abd2494;hb=d5618f84e921515fa6ce6ec05180f0651119c297;hp=89ba5fc788be3df8749f5248a9fdb65d02b3f91e;hpb=da774ae85617b051675afe581f413da78febfc0f;p=fa-stable.git

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 89ba5fc7..d08952e2 100644
--- 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
@@ -132,12 +137,21 @@ function check_valid_entries()
 
 	$limit = get_bank_account_limit($_POST['FromBankAccount'], $_POST['DatePaid']);
 
-	if ($limit != null && ($limit < (input_num('charge') + input_num('amount'))))
+	$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)) 
 	{
@@ -171,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;
 }
 
@@ -178,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");
 }