"; // outer table
-
- echo "";
-
- bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
-
- amount_row(_("Amount of Payment:"), 'amount');
- amount_row(_("Amount of Discount:"), 'discount');
-
- date_row(_("Date Paid") . ":", 'DatePaid');
-
- echo " ";
- echo " | "; // outer table
- echo "";
-
- supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
-
- set_global_supplier($_POST['supplier_id']);
-
- $supplier_currency = get_supplier_currency($_POST['supplier_id']);
- $bank_currency = get_bank_account_currency($_POST['bank_account']);
- if ($bank_currency != $supplier_currency)
+ display_error(_("There is no supplier selected."));
+ set_focus('supplier_id');
+ return false;
+ }
+
+ if ($_POST['amount'] == "")
{
- exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid']);
+ $_POST['amount'] = price_format(0);
}
- bank_trans_types_list_row(_("Payment Type:"), 'PaymentType', null);
-
- ref_row(_("Reference:"), 'ref', references::get_next(22));
-
- text_row(_("Memo:"), 'memo_', null, 52,50);
-
- echo " ";
-
- echo " |
";
- end_table(1); // outer table
-
- submit_center('ProcessSuppPayment',_("Enter Payment"));
-
- if ($bank_currency != $supplier_currency)
+ if (!check_num('amount', 0))
{
- display_note(_("The amount and discount are in the bank account's currency."), 2, 0);
+ display_error(_("The entered amount is invalid or less than zero."));
+ set_focus('amount');
+ return false;
}
- end_form();
-}
-
-//----------------------------------------------------------------------------------------
+ if (isset($_POST['charge']) && !check_num('charge', 0)) {
+ display_error(_("The entered amount is invalid or less than zero."));
+ set_focus('charge');
+ return false;
+ }
-function check_inputs()
-{
- if ($_POST['amount'] == "")
- {
- $_POST['amount'] = 0;
+ if (isset($_POST['charge']) && input_num('charge') > 0) {
+ $charge_acct = get_company_pref('bank_charge_act');
+ if (get_gl_account($charge_acct) == false) {
+ display_error(_("The Bank Charge Account has not been set in System and General GL Setup."));
+ set_focus('charge');
+ return false;
+ }
}
- if (!is_numeric($_POST['amount']) || $_POST['amount'] < 0)
+ if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
{
- display_error(_("The entered amount is invalid or less than zero."));
+ display_error(_("The exchange rate must be numeric and greater than zero."));
+ set_focus('_ex_rate');
return false;
}
@@ -134,55 +155,89 @@ function check_inputs()
$_POST['discount'] = 0;
}
- if (!is_numeric($_POST['discount']) OR $_POST['discount'] < 0)
+ if (!check_num('discount', 0))
{
display_error(_("The entered discount is invalid or less than zero."));
+ set_focus('amount');
return false;
}
- if ($_POST['amount'] - $_POST['discount'] <= 0)
+ //if (input_num('amount') - input_num('discount') <= 0)
+ if (input_num('amount') <= 0)
{
- display_error(_("The total of the amount and the discount negative. Please enter positive values."));
+ display_error(_("The total of the amount and the discount is zero or negative. Please enter positive values."));
+ set_focus('amount');
return false;
}
if (!is_date($_POST['DatePaid']))
{
display_error(_("The entered date is invalid."));
+ set_focus('DatePaid');
return false;
}
elseif (!is_date_in_fiscalyear($_POST['DatePaid']))
{
display_error(_("The entered date is not in fiscal year."));
+ set_focus('DatePaid');
return false;
}
- if (!references::is_valid($_POST['ref']))
+
+ $limit = get_bank_account_limit($_POST['bank_account'], $_POST['DatePaid']);
+
+ if ($limit != null && ($limit < input_num('amount')))
+ {
+ display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit)));
+ set_focus('amount');
+ 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'], 22))
+ if (!is_new_reference($_POST['ref'], ST_SUPPAYMENT))
{
display_error(_("The entered reference is already in use."));
+ set_focus('ref');
return false;
}
- return true;
+ if (!db_has_currency_rates(get_supplier_currency($_POST['supplier_id']), $_POST['DatePaid'], true))
+ return false;
+ $_SESSION['alloc']->amount = -input_num('amount');
+
+ if (isset($_POST["TotalNumberOfAllocs"]))
+ return check_allocations();
+ else
+ return true;
}
//----------------------------------------------------------------------------------------
function handle_add_payment()
{
+ $supp_currency = get_supplier_currency($_POST['supplier_id']);
+ $bank_currency = get_bank_account_currency($_POST['bank_account']);
+ $comp_currency = get_company_currency();
+ if ($comp_currency != $bank_currency && $bank_currency != $supp_currency)
+ $rate = 0;
+ else
+ $rate = input_num('_ex_rate');
+
$payment_id = add_supp_payment($_POST['supplier_id'], $_POST['DatePaid'],
- $_POST['PaymentType'], $_POST['bank_account'],
- $_POST['amount'], $_POST['discount'], $_POST['ref'], $_POST['memo_']);
+ $_POST['bank_account'], input_num('amount'), input_num('discount'),
+ $_POST['ref'], $_POST['memo_'], $rate, input_num('charge'));
+ new_doc_date($_POST['DatePaid']);
+ $_SESSION['alloc']->trans_no = $payment_id;
+ $_SESSION['alloc']->write();
//unset($_POST['supplier_id']);
unset($_POST['bank_account']);
unset($_POST['DatePaid']);
- unset($_POST['PaymentType']);
unset($_POST['currency']);
unset($_POST['memo_']);
unset($_POST['amount']);
@@ -205,7 +260,71 @@ if (isset($_POST['ProcessSuppPayment']))
}
}
-display_controls();
+//----------------------------------------------------------------------------------------
+
+start_form();
+
+ start_outer_table(TABLESTYLE2, "width=60%", 5);
+
+ table_section(1);
+
+ supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
+
+ if (list_updated('supplier_id') || list_updated('bank_account')) {
+ $_SESSION['alloc']->read();
+ $_POST['memo_'] = $_POST['amount'] = '';
+ $Ajax->activate('alloc_tbl');
+ }
+
+ set_global_supplier($_POST['supplier_id']);
+
+ if (!list_updated('bank_account'))
+ $_POST['bank_account'] = get_default_supplier_bank_account($_POST['supplier_id']);
+
+ bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
+
+ bank_balance_row($_POST['bank_account']);
+
+ table_section(2);
+
+ ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT));
+
+ date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true);
+
+ table_section(3);
+
+ $supplier_currency = get_supplier_currency($_POST['supplier_id']);
+ $bank_currency = get_bank_account_currency($_POST['bank_account']);
+ if ($bank_currency != $supplier_currency)
+ {
+ exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid'], true);
+ }
+
+ amount_row(_("Bank Charge:"), 'charge');
+
+
+ end_outer_table(1); // outer table
+
+ if ($bank_currency == $supplier_currency) {
+ div_start('alloc_tbl');
+ show_allocatable(false);
+ div_end();
+ }
+
+ start_table(TABLESTYLE, "width=60%");
+ amount_row(_("Amount of Discount:"), 'discount');
+ amount_row(_("Amount of Payment:"), 'amount');
+ textarea_row(_("Memo:"), 'memo_', null, 22, 4);
+ end_table(1);
+
+ if ($bank_currency != $supplier_currency)
+ {
+ display_note(_("The amount and discount are in the bank account's currency."), 0, 1);
+ }
+
+ submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', 'default');
+
+end_form();
end_page();
?>