X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=938c2a8d506d4b984195e86abf6fa5dcc79074eb;hb=7286bbfc939360b0fcb573ae075b2b8e899d96c8;hp=93cda07ef5ff2c5555ed3c07eb84a1c3a2d2d284;hpb=c0d93311185d0657a6ff4a3c1e00c7967738fd27;p=fa-stable.git diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index 93cda07e..938c2a8d 100644 --- a/purchasing/supplier_payment.php +++ b/purchasing/supplier_payment.php @@ -9,8 +9,8 @@ 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"); @@ -19,6 +19,7 @@ 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 +29,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'])) { @@ -42,15 +43,6 @@ 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); @@ -67,18 +59,47 @@ if (isset($_POST['_DatePaid_changed'])) { } if (list_updated('supplier_id') || list_updated('bank_account')) { - get_allocations_for_transaction(22, 0); + $_SESSION['alloc']->read(); $Ajax->activate('alloc_tbl'); } //---------------------------------------------------------------------------------------- -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"); @@ -91,6 +112,8 @@ if (isset($_GET['AddedID'])) function check_inputs() { + global $Refs; + if ($_POST['amount'] == "") { $_POST['amount'] = price_format(0); @@ -109,6 +132,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.")); @@ -147,14 +179,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'); @@ -162,7 +194,11 @@ function check_inputs() } $_SESSION['alloc']->amount = -input_num('amount'); - return check_allocations(); + + if (isset($_POST["TotalNumberOfAllocs"])) + return check_allocations(); + else + return true; } //---------------------------------------------------------------------------------------- @@ -183,7 +219,7 @@ function handle_add_payment() new_doc_date($_POST['DatePaid']); $_SESSION['alloc']->trans_no = $payment_id; - handle_allocate(); + $_SESSION['alloc']->write(); //unset($_POST['supplier_id']); unset($_POST['bank_account']); unset($_POST['DatePaid']); @@ -213,25 +249,19 @@ if (isset($_POST['ProcessSuppPayment'])) start_form(); - //start_table($table_style2, 5, 7); - //echo ""; // outer table - start_outer_table("$table_style2 width=90%", 5); + start_outer_table("$table_style2 width=60%", 5); - //echo ""; table_section(1); supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true); - if (!isset($_POST['bank_account'])) // first page call - get_allocations_for_transaction(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); @@ -263,7 +293,7 @@ start_form(); if ($bank_currency != $supplier_currency) { - display_note(_("The amount and discount are in the bank account's currency."), 2, 0); + display_note(_("The amount and discount are in the bank account's currency."), 0, 1); } submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', 'default');