projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged all main trunk bugfixes up to release 2.0.5
[fa-stable.git]
/
gl
/
bank_transfer.php
diff --git
a/gl/bank_transfer.php
b/gl/bank_transfer.php
index 2f5b1f1ae4265186679708f2147a309757c62c45..87e82c71daed0f1e7f6686fabe59091db54794e8 100644
(file)
--- a/
gl/bank_transfer.php
+++ b/
gl/bank_transfer.php
@@
-19,7
+19,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."));
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
+29,17
@@
if (isset($_GET['AddedID']))
display_notification_centered( _("Transfer has been entered"));
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();
}
safeExit();
}
+if (isset($_POST['_DatePaid_changed'])) {
+ $Ajax->activate('_ex_rate');
+}
+
//----------------------------------------------------------------------------------------
function gl_payment_controls()
//----------------------------------------------------------------------------------------
function gl_payment_controls()
@@
-54,7
+57,7
@@
function gl_payment_controls()
bank_accounts_list_row(_("To Account:"), 'ToBankAccount', null, true);
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']);
$from_currency = get_bank_account_currency($_POST['FromBankAccount']);
$to_currency = get_bank_account_currency($_POST['ToBankAccount']);
@@
-73,9
+76,7
@@
function gl_payment_controls()
echo "</td><td valign=top class='tableseparator'>"; // outer table
echo "<table>";
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);
textarea_row(_("Memo:"), 'memo_', null, 40,4);
@@
-84,7
+85,7
@@
function gl_payment_controls()
echo "</td></tr>";
end_table(1); // outer table
echo "</td></tr>";
end_table(1); // outer table
- submit_center('AddPayment',_("Enter Transfer"));
+ submit_center('AddPayment',_("Enter Transfer")
, true, '', true
);
end_form();
}
end_form();
}
@@
-96,40
+97,41
@@
function check_valid_entries()
if (!is_date($_POST['DatePaid']))
{
display_error(_("The entered date is invalid."));
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."));
return false;
}
if (!is_date_in_fiscalyear($_POST['DatePaid']))
{
display_error(_("The entered date is not in fiscal year."));
+ set_focus('DatePaid');
return false;
}
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."));
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."));
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."));
return false;
}
if ($_POST['FromBankAccount'] == $_POST['ToBankAccount'])
{
display_error(_("The source and destination bank accouts cannot be the same."));
+ set_focus('ToBankAccount');
return false;
}
return false;
}
@@
-143,8
+145,7
@@
function handle_add_deposit()
global $path_to_root;
$trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'],
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");
}
meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
}