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));
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']);
+ amount_row(_("Incoming Amount:"), 'target_amount', null, '', $to_currency, 2);
}
else
{
$amnt_tr = input_num('charge') + input_num('amount');
- if ($limit != null && ($limit < $amnt_tr))
+ if ($limit !== null && floatcmp($limit, $amnt_tr) < 0)
{
display_error(sprintf(_("The total bank amount exceeds allowed limit (%s) for source account."), price_format($limit)));
set_focus('amount');
return false;
}
+ if (isset($_POST['target_amount']) && !check_num('target_amount', 0))
+ {
+ display_error(_("The entered amount is invalid or less than zero."));
+ set_focus('target_amount');
+ return false;
+ }
+ if (isset($_POST['target_amount']) && input_num('target_amount') == 0) {
+ display_error(_("The incomming bank amount cannot be 0."));
+ set_focus('target_amount');
+ 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;
}
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'));
+ $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_'], input_num('charge'), input_num('target_amount'));
meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
}