X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=9bd3559f4b13596e9b888e4230e9ad0fb0efff94;hb=367dd78454169cb866bfd8b3134a73458cfa6588;hp=82ad2750a09926bc664eb0a3f0582e3b9ba8b14f;hpb=86e4d1627183fb4d97fe145a5dd33b43b03284ee;p=fa-stable.git diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index 82ad2750..9bd3559f 100644 --- a/purchasing/supplier_payment.php +++ b/purchasing/supplier_payment.php @@ -9,23 +9,26 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$path_to_root=".."; -$page_security = 5; +$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/purchasing_db.inc"); +include_once($path_to_root . "/reporting/includes/reporting.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(_($help_context = "Supplier Payment Entry"), false, false, "", $js); if (isset($_GET['supplier_id'])) { @@ -39,95 +42,80 @@ 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.")); //---------------------------------------------------------------------------------------- -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', '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 (isset($_GET['AddedID'])) -{ +if (!isset($_POST['bank_account'])) { // first page call + $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0); + + if (isset($_GET['PInvoice'])) { + // get date and supplier + $inv = get_supp_trans($_GET['PInvoice'], ST_SUPPINVOICE); + if($inv) { + $_POST['supplier_id'] = $inv['supplier_id']; + $_POST['DatePaid'] = sql2date($inv['tran_date']); +// $_POST['discount'] = price_format(0); +// $_POST['bank_account'], $_POST['ref'] + $_POST['memo_'] = $inv['supp_reference']; + foreach($_SESSION['alloc']->allocs as $line => $trans) { + if ($trans->type == ST_SUPPINVOICE && $trans->type_no == $_GET['PInvoice']) { + $_POST['amount'] = + $_SESSION['alloc']->amount = price_format($_SESSION['alloc']->allocs[$line]->amount); + $_SESSION['alloc']->allocs[$line]->current_allocated = + $_SESSION['alloc']->allocs[$line]->amount; + break; + } + } + unset($inv); + } else + display_error(_("Invalid purchase invoice number.")); + } +} +if (isset($_GET['AddedID'])) { $payment_id = $_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"))); + submenu_print(_("&Print This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, 'prtopt'); + submenu_print(_("&Email This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, null, 1); + + display_note(get_gl_view_str(ST_SUPPAYMENT, $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_no_params($path_to_root . "/purchasing/inquiry/supplier_allocation_inquiry.php?supplier_id=", _("Select Another &Supplier Transaction for Payment")); +// 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() +function check_inputs() { - global $table_style2; - start_form(false, true); + global $Refs; - if (!isset($_POST['supplier_id'])) - $_POST['supplier_id'] = get_global_supplier(false); - if (!isset($_POST['DatePaid'])) + if (!get_post('supplier_id')) { - $_POST['DatePaid'] = Today(); - if (!is_date_in_fiscalyear($_POST['DatePaid'])) - $_POST['DatePaid'] = end_fiscalyear(); - } - start_outer_table($table_style2, 5); - - table_section(1); + display_error(_("There is no supplier selected.")); + set_focus('supplier_id'); + return false; + } - 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); - - table_section(2); - - supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true); - - set_global_supplier($_POST['supplier_id']); - - $comp_currency = get_company_currency(); - $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_currency == $comp_currency)); - } - - ref_row(_("Reference:"), 'ref', '', references::get_next(22)); - - text_row(_("Memo:"), 'memo_', null, 52,50); - - end_outer_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'] == "") { $_POST['amount'] = price_format(0); @@ -140,6 +128,21 @@ 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['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 (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001)) { display_error(_("The exchange rate must be numeric and greater than zero.")); @@ -159,7 +162,8 @@ function check_inputs() return false; } - if (input_num('amount') - input_num('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 is zero or negative. Please enter positive values.")); set_focus('amount'); @@ -178,21 +182,38 @@ function check_inputs() 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; } //---------------------------------------------------------------------------------------- @@ -209,8 +230,11 @@ 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']); + $_SESSION['alloc']->trans_no = $payment_id; + $_SESSION['alloc']->write(); //unset($_POST['supplier_id']); unset($_POST['bank_account']); unset($_POST['DatePaid']); @@ -236,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(); ?>