X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fbank_transfer.php;h=f971fc569249772f9eced311c8d63ecd785dc6f6;hb=cc36638b65572da4867b7622723d6ed0135525b8;hp=78089f5a4db6f59b56a0d5a128042c4bf1ff48c8;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git
diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 78089f5a..f971fc56 100644
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -1,7 +1,16 @@
.
+***********************************************************************/
+$page_security = 'SA_BANKTRANSFER';
+$path_to_root = "..";
include_once($path_to_root . "/includes/session.inc");
@@ -19,20 +28,19 @@ 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."));
//----------------------------------------------------------------------------------------
if (isset($_GET['AddedID']))
{
$trans_no = $_GET['AddedID'];
- $trans_type = systypes::bank_transfer();
+ $trans_type = ST_BANKTRANSFER;
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();
}
@@ -45,15 +53,16 @@ if (isset($_POST['_DatePaid_changed'])) {
function gl_payment_controls()
{
- global $table_style2;
+ global $table_style2, $Refs;
+
$home_currency = get_company_currency();
- start_form(false, true);
+ start_form();
+
+ start_outer_table($table_style2, 5);
- start_table($table_style2, 5, 7);
- echo "
"; // outer table
+ table_section(1);
- echo "";
bank_accounts_list_row(_("From Account:"), 'FromBankAccount', null, true);
bank_accounts_list_row(_("To Account:"), 'ToBankAccount', null, true);
@@ -65,30 +74,25 @@ function gl_payment_controls()
if ($from_currency != "" && $to_currency != "" && $from_currency != $to_currency)
{
amount_row(_("Amount:"), 'amount', null, null, $from_currency);
+ amount_row(_("Bank Charge:"), 'charge', null, null, $from_currency);
exchange_rate_display($from_currency, $to_currency, $_POST['DatePaid']);
}
else
{
amount_row(_("Amount:"), 'amount');
+ amount_row(_("Bank Charge:"), 'charge');
}
- echo " ";
- echo " | "; // outer table
- echo "";
-
- bank_trans_types_list_row(_("Transfer Type:"), 'TransferType', null);
+ table_section(2);
- ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_transfer()));
+ ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKTRANSFER));
textarea_row(_("Memo:"), 'memo_', null, 40,4);
- end_table(1);
+ end_outer_table(1); // outer table
- echo "";
- end_table(1); // outer table
-
- submit_center('AddPayment',_("Enter Transfer"), true, '', true);
+ submit_center('AddPayment',_("Enter Transfer"), true, '', 'default');
end_form();
}
@@ -97,6 +101,8 @@ function gl_payment_controls()
function check_valid_entries()
{
+ global $Refs;
+
if (!is_date($_POST['DatePaid']))
{
display_error(_("The entered date is invalid."));
@@ -117,14 +123,25 @@ function check_valid_entries()
return false;
}
- if (!references::is_valid($_POST['ref']))
+ if (isset($_POST['charge']) && !check_num('charge', 0))
+ {
+ display_error(_("The entered amount is invalid or less than zero."));
+ set_focus('charge');
+ return false;
+ }
+ if (isset($_POST['charge']) && input_num('charge') > 0 && get_company_pref('bank_charge_act') == '') {
+ display_error(_("The Bank Charge Account has not been set in System and General GL Setup."));
+ set_focus('charge');
+ return false;
+ }
+ if (!$Refs->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()))
+ if (!is_new_reference($_POST['ref'], ST_BANKTRANSFER))
{
display_error(_("The entered reference is already in use."));
set_focus('ref');
@@ -145,11 +162,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_'], input_num('charge'));
meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
}
@@ -158,7 +172,6 @@ function handle_add_deposit()
function safeExit()
{
- global $path_to_root;
echo "
";
end_page();
exit;
|