X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=c390f7a09e91fcbfaea936046d2d51443b932921;hb=19b77e12bf5c056e3141032c62cc8d9ad7a21d6e;hp=5f5a783b98ca16f9b8ee9b6d459cc5c5d3814c4a;hpb=0ad7b92c6cf2e4e65ca0fa94ba31f30f7b292ba8;p=fa-stable.git

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 5f5a783b..c390f7a0 100644
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $path_to_root="..";
 $page_security = 5;
 
@@ -19,7 +28,6 @@ if ($use_date_picker)
 page(_("Transfer between Bank Accounts"), false, false, "", $js);
 
 check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
-check_db_has_bank_trans_types(_("There are no bank transfer types defined in the system."));
 
 //----------------------------------------------------------------------------------------
 
@@ -30,13 +38,17 @@ if (isset($_GET['AddedID']))
 
    	display_notification_centered( _("Transfer has been entered"));
 
-	display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Journal Entries for this Transfer")));
+	display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Journal Entries for this Transfer")));
 
-   	hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter Another Transfer"));
+   	hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Transfer"));
 
 	safeExit();
 }
 
+if (isset($_POST['_DatePaid_changed'])) {
+	$Ajax->activate('_ex_rate');
+}
+
 //----------------------------------------------------------------------------------------
 
 function gl_payment_controls()
@@ -54,7 +66,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']);
@@ -73,9 +85,7 @@ function gl_payment_controls()
 	echo "</td><td valign=top class='tableseparator'>"; // outer table
 	echo "<table>";
 
-	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 +94,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,35 +106,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 (!check_num('amount', 0)) 
 	{
 		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;
 	}
 
@@ -135,11 +151,8 @@ function check_valid_entries()
 
 function handle_add_deposit()
 {
-	global $path_to_root;
-
 	$trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'],
-		$_POST['DatePaid'], input_num('amount'),
-		$_POST['TransferType'], $_POST['ref'], $_POST['memo_']);
+		$_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_']);
 
 	meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
 }
@@ -148,7 +161,6 @@ function handle_add_deposit()
 
 function safeExit()
 {
-	global $path_to_root;
 	echo "<br><br>";
 	end_page();
 	exit;