X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=f4e4f776837b9fe9e08f0158e32e4d3bb2abede2;hb=131fcadb832694065ea08b857cfe758cd131494f;hp=28e16c6f3229aad6c1229f0f2cd93aba3ebf60ef;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index 28e16c6f..f4e4f776 100644 --- a/purchasing/supplier_payment.php +++ b/purchasing/supplier_payment.php @@ -1,22 +1,34 @@ . +***********************************************************************/ +$page_security = 'SA_SUPPLIERPAYMNT'; +$path_to_root = ".."; +include_once($path_to_root . "/includes/ui/allocation_cart.inc"); include_once($path_to_root . "/includes/session.inc"); - include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/banking.inc"); include_once($path_to_root . "/includes/data_checks.inc"); - +//include_once($path_to_root . "/purchasing/includes/ui/supp_alloc_ui.inc"); include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); + $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Supplier Payment Entry"), false, false, "", $js); +add_js_file('payalloc.js'); + +page(_("Supplier Payment Entry"), false, false, "", $js); if (isset($_GET['supplier_id'])) { @@ -29,21 +41,26 @@ check_db_has_suppliers(_("There are no suppliers defined in the system.")); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); -check_db_has_bank_trans_types(_("There are no bank payment types defined in the system.")); - //---------------------------------------------------------------------------------------- -if ($ret = context_restore()) { - if(isset($ret['supplier_id'])) - $_POST['supplier_id'] = $ret['supplier_id']; -} -if (isset($_POST['_supplier_id_editor'])) { - context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], - array( 'supplier_id', 'bank_account', 'DatePaid', - 'PaymentType', 'ref', 'amount', 'discount', 'memo_') ); + +if (!isset($_POST['supplier_id'])) + $_POST['supplier_id'] = get_global_supplier(false); + +if (!isset($_POST['DatePaid'])) +{ + $_POST['DatePaid'] = new_doc_date(); + if (!is_date_in_fiscalyear($_POST['DatePaid'])) + $_POST['DatePaid'] = end_fiscalyear(); } + if (isset($_POST['_DatePaid_changed'])) { $Ajax->activate('_ex_rate'); } + +if (list_updated('supplier_id') || list_updated('bank_account')) { + $_SESSION['alloc']->read(); + $Ajax->activate('alloc_tbl'); +} //---------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) @@ -52,80 +69,17 @@ if (isset($_GET['AddedID'])) display_notification_centered( _("Payment has been sucessfully entered")); - display_note(get_gl_view_str(22, $payment_id, _("View the GL Journal Entries for this Payment"))); + display_note(get_gl_view_str(22, $payment_id, _("View the GL &Journal Entries for this Payment"))); - hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("Allocate this Payment"), "trans_no=$payment_id&trans_type=22"); +// hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22"); - hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier payment"), "supplier_id=" . $_POST['supplier_id']); + hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier &payment"), "supplier_id=" . $_POST['supplier_id']); display_footer_exit(); } //---------------------------------------------------------------------------------------- -function display_controls() -{ - global $table_style2; - start_form(false, true); - - if (!isset($_POST['supplier_id'])) - $_POST['supplier_id'] = get_global_supplier(false); - if (!isset($_POST['DatePaid'])) - { - $_POST['DatePaid'] = Today(); - if (!is_date_in_fiscalyear($_POST['DatePaid'])) - $_POST['DatePaid'] = end_fiscalyear(); - } - start_table($table_style2, 5, 7); - echo ""; // 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', '', null, 0, 0, 0, null, true); - - 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) - { - exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid']); - } - - 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"), true, '', true); - - if ($bank_currency != $supplier_currency) - { - display_note(_("The amount and discount are in the bank account's currency."), 2, 0); - } - - end_form(); -} - -//---------------------------------------------------------------------------------------- - function check_inputs() { if ($_POST['amount'] == "") @@ -140,6 +94,19 @@ 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.")); + set_focus('_ex_rate'); + return false; + } + if ($_POST['discount'] == "") { $_POST['discount'] = 0; @@ -154,7 +121,7 @@ function check_inputs() if (input_num('amount') - input_num('discount') <= 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; } @@ -185,21 +152,32 @@ function check_inputs() return false; } - return true; + $_SESSION['alloc']->amount = -input_num('amount'); + return check_allocations(); } //---------------------------------------------------------------------------------------- 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'], - input_num('amount'), input_num('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']); @@ -222,7 +200,63 @@ if (isset($_POST['ProcessSuppPayment'])) } } -display_controls(); +//---------------------------------------------------------------------------------------- + +start_form(); + + start_outer_table("$table_style2 width=60%", 5); + + table_section(1); + + supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true); + + if (!isset($_POST['bank_account'])) // first page call + $_SESSION['alloc'] = new allocation(22, 0); + + set_global_supplier($_POST['supplier_id']); + + bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true); + + table_section(2); + + ref_row(_("Reference:"), 'ref', '', references::get_next(22)); + + 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("$table_style 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(); ?>