X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=c390f7a09e91fcbfaea936046d2d51443b932921;hb=588ed54d44a168d4355838f0d3493bcb639ec03c;hp=2f5b1f1ae4265186679708f2147a309757c62c45;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git
diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 2f5b1f1a..c390f7a0 100644
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$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 "
"; // outer table
echo "";
- 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 "";
end_table(1); // outer table
- submit_center('AddPayment',_("Enter Transfer"));
+ submit_center('AddPayment',_("Enter Transfer"), true, '', true);
end_form();
}
@@ -96,40 +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 (!is_numeric($_POST['amount']))
+ if (!check_num('amount', 0))
{
- display_error(_("The entered amount is invalid."));
- return false;
- }
- if ($_POST['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;
}
@@ -140,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'], $_POST['amount'],
- $_POST['TransferType'], $_POST['ref'], $_POST['memo_']);
+ $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_']);
meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
}
@@ -153,7 +161,6 @@ function handle_add_deposit()
function safeExit()
{
- global $path_to_root;
echo "
";
end_page();
exit;
|