X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=1dbc3939c0ed714558ad897b7dc2649f33d6a6cb;hb=eed850acf1c3a796fe0cc1ed673cc6cd7d893647;hp=a4866002f03135947b2d6bf8cb7926d20c670b6e;hpb=87d9f474b6aa43b86c9d8dc8a66cd08371a0f19b;p=fa-stable.git

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index a4866002..1dbc3939 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']);
@@ -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
@@ -113,7 +118,7 @@ function check_valid_entries()
 	}
 	if (!is_date_in_fiscalyear($_POST['DatePaid']))
 	{
-		display_error(_("The entered date is not in fiscal year."));
+		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
 		set_focus('DatePaid');
 		return false;
 	}
@@ -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;
@@ -179,6 +184,12 @@ function check_valid_entries()
 		set_focus('ToBankAccount');
 		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,6 +198,7 @@ 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'));