X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=78089f5a4db6f59b56a0d5a128042c4bf1ff48c8;hb=43aa0abba82e8fa1f770b3b798875e7cae1e4b78;hp=2f5b1f1ae4265186679708f2147a309757c62c45;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 2f5b1f1a..78089f5a 100644
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -37,6 +37,10 @@ if (isset($_GET['AddedID']))
 	safeExit();
 }
 
+if (isset($_POST['_DatePaid_changed'])) {
+	$Ajax->activate('_ex_rate');
+}
+
 //----------------------------------------------------------------------------------------
 
 function gl_payment_controls()
@@ -54,7 +58,7 @@ function gl_payment_controls()
 
     bank_accounts_list_row(_("To Account:"), 'ToBankAccount', null, true);
 
-    date_row(_("Transfer Date:"), 'DatePaid');
+    date_row(_("Transfer Date:"), 'DatePaid', '', null, 0, 0, 0, null, true);
 
 	$from_currency = get_bank_account_currency($_POST['FromBankAccount']);
 	$to_currency = get_bank_account_currency($_POST['ToBankAccount']);
@@ -75,7 +79,7 @@ function gl_payment_controls()
 
 	bank_trans_types_list_row(_("Transfer Type:"), 'TransferType', null);
 
-    ref_row(_("Reference:"), 'ref', references::get_next(systypes::bank_transfer()));
+    ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_transfer()));
 
     textarea_row(_("Memo:"), 'memo_', null, 40,4);
 
@@ -84,7 +88,7 @@ function gl_payment_controls()
 	echo "</td></tr>";
 	end_table(1); // outer table
 
-    submit_center('AddPayment',_("Enter Transfer"));
+    submit_center('AddPayment',_("Enter Transfer"), true, '', true);
 
 	end_form();
 }
@@ -96,40 +100,41 @@ function check_valid_entries()
 	if (!is_date($_POST['DatePaid'])) 
 	{
 		display_error(_("The entered date is invalid."));
+		set_focus('DatePaid');
 		return false;
 	}
 	if (!is_date_in_fiscalyear($_POST['DatePaid']))
 	{
 		display_error(_("The entered date is not in fiscal year."));
+		set_focus('DatePaid');
 		return false;
 	}
 
-	if (!is_numeric($_POST['amount'])) 
-	{
-		display_error(_("The entered amount is invalid."));
-		return false;
-	}
-	if ($_POST['amount'] <= 0) 
+	if (!check_num('amount', 0)) 
 	{
-		display_error(_("The entered amount must be a positive number."));
+		display_error(_("The entered amount is invalid or less than zero."));
+		set_focus('amount');
 		return false;
 	}
 
 	if (!references::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())) 
 	{
 		display_error(_("The entered reference is already in use."));
+		set_focus('ref');
 		return false;
 	}
 
 	if ($_POST['FromBankAccount'] == $_POST['ToBankAccount']) 
 	{
 		display_error(_("The source and destination bank accouts cannot be the same."));
+		set_focus('ToBankAccount');
 		return false;
 	}
 
@@ -143,7 +148,7 @@ function handle_add_deposit()
 	global $path_to_root;
 
 	$trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'],
-		$_POST['DatePaid'], $_POST['amount'],
+		$_POST['DatePaid'], input_num('amount'),
 		$_POST['TransferType'], $_POST['ref'], $_POST['memo_']);
 
 	meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");