X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=0d094ba346b5e49d0512ed05b905e1d33be4bf38;hb=9b7ac7414c4ec6b3284adb22876cd5142ac78fa3;hp=a2603dfb113c43b1710bec4e80384b66fe7b1bee;hpb=cf7be1f00c6abe59755286e0c3108d9d3c0356da;p=fa-stable.git diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index a2603dfb..0d094ba3 100644 --- a/purchasing/supplier_payment.php +++ b/purchasing/supplier_payment.php @@ -9,16 +9,16 @@ 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/ui/supp_alloc_ui.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) @@ -28,7 +28,7 @@ if ($use_date_picker) add_js_file('payalloc.js'); -page(_("Supplier Payment Entry"), false, false, "", $js); +page(_($help_context = "Supplier Payment Entry"), false, false, "", $js); if (isset($_GET['supplier_id'])) { @@ -63,13 +63,42 @@ if (list_updated('supplier_id') || list_updated('bank_account')) { } //---------------------------------------------------------------------------------------- -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"); @@ -82,6 +111,15 @@ if (isset($_GET['AddedID'])) function check_inputs() { + global $Refs; + + if (!get_post('supplier_id')) + { + display_error(_("There is no supplier selected.")); + set_focus('supplier_id'); + return false; + } + if ($_POST['amount'] == "") { $_POST['amount'] = price_format(0); @@ -100,6 +138,15 @@ function check_inputs() 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.")); @@ -119,7 +166,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'); @@ -138,14 +186,14 @@ function check_inputs() set_focus('DatePaid'); return false; } - if (!references::is_valid($_POST['ref'])) + 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'); @@ -153,7 +201,11 @@ function check_inputs() } $_SESSION['alloc']->amount = -input_num('amount'); - return check_allocations(); + + if (isset($_POST["TotalNumberOfAllocs"])) + return check_allocations(); + else + return true; } //---------------------------------------------------------------------------------------- @@ -204,22 +256,19 @@ if (isset($_POST['ProcessSuppPayment'])) start_form(); - start_outer_table("$table_style2 width=60%", 5); + start_outer_table(TABLESTYLE2, "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)); + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT)); date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true); @@ -243,7 +292,7 @@ start_form(); div_end(); } - start_table("$table_style width=60%"); + start_table(TABLESTYLE, "width=60%"); amount_row(_("Amount of Discount:"), 'discount'); amount_row(_("Amount of Payment:"), 'amount'); textarea_row(_("Memo:"), 'memo_', null, 22, 4);