X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fsupplier_payment.php;h=fca9417f998dc7371106bb11728e363a72910394;hb=4f57367b97832827258d1140ca423a26cf714142;hp=8f997c8888cb92052b1356d297a6c167fe86b5d6;hpb=bf00f0e16df5974ecba17b59be8bc660bdf6b8a8;p=fa-stable.git
diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 8f997c88..fca9417f 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$path_to_root="..";
$page_security = 5;
include_once($path_to_root . "/includes/session.inc");
@@ -64,31 +73,32 @@ if (isset($_GET['AddedID']))
function display_controls()
{
global $table_style2;
- start_form(false, true);
+ start_form();
if (!isset($_POST['supplier_id']))
$_POST['supplier_id'] = get_global_supplier(false);
if (!isset($_POST['DatePaid']))
{
- $_POST['DatePaid'] = Today();
+ $_POST['DatePaid'] = new_doc_date();
if (!is_date_in_fiscalyear($_POST['DatePaid']))
$_POST['DatePaid'] = end_fiscalyear();
}
- start_table($table_style2, 5, 7);
- echo "
"; // outer table
-
- echo "";
+ //start_table($table_style2, 5, 7);
+ //echo ""; // outer table
+ start_outer_table($table_style2, 5);
+ //echo "";
+ table_section(1);
+
bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
amount_row(_("Amount of Payment:"), 'amount');
amount_row(_("Amount of Discount:"), 'discount');
+ amount_row(_("Bank Charge:"), 'charge');
- date_row(_("Date Paid") . ":", 'DatePaid', '', null, 0, 0, 0, null, true);
+ date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true);
- echo " ";
- echo " | "; // outer table
- echo "";
+ table_section(2);
supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
@@ -103,14 +113,11 @@ function display_controls()
ref_row(_("Reference:"), 'ref', '', references::get_next(22));
- text_row(_("Memo:"), 'memo_', null, 52,50);
+ textarea_row(_("Memo:"), 'memo_', null, 22, 4);
- echo " ";
+ end_outer_table(1); // outer table
- echo " | ";
- end_table(1); // outer table
-
- submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', true);
+ submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', 'default');
if ($bank_currency != $supplier_currency)
{
@@ -136,6 +143,12 @@ function check_inputs()
return false;
}
+ 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['_ex_rate']) && !check_num('_ex_rate', 0.000001))
{
display_error(_("The exchange rate must be numeric and greater than zero."));
@@ -205,8 +218,8 @@ function handle_add_payment()
$payment_id = add_supp_payment($_POST['supplier_id'], $_POST['DatePaid'],
$_POST['bank_account'], input_num('amount'), input_num('discount'),
- $_POST['ref'], $_POST['memo_'], $rate);
-
+ $_POST['ref'], $_POST['memo_'], $rate, input_num('charge'));
+ new_doc_date($_POST['DatePaid']);
//unset($_POST['supplier_id']);
unset($_POST['bank_account']);
unset($_POST['DatePaid']);
|