X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=a2603dfb113c43b1710bec4e80384b66fe7b1bee;hb=8f7ac519b7aaf8ec219862597e878d3a28316ac6;hp=fca9417f998dc7371106bb11728e363a72910394;hpb=f20f229779b9db77c3f978fac90dfcb571bd551c;p=fa-stable.git diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index fca9417f..a2603dfb 100644 --- a/purchasing/supplier_payment.php +++ b/purchasing/supplier_payment.php @@ -11,21 +11,24 @@ ***********************************************************************/ $path_to_root=".."; $page_security = 5; +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'])) { @@ -39,18 +42,25 @@ 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 (list_updated('supplier_id') || list_updated('bank_account')) { + $_SESSION['alloc']->read(); + $Ajax->activate('alloc_tbl'); +} //---------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) @@ -61,7 +71,7 @@ if (isset($_GET['AddedID'])) 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']); @@ -70,65 +80,6 @@ if (isset($_GET['AddedID'])) //---------------------------------------------------------------------------------------- -function display_controls() -{ - global $table_style2; - start_form(); - - 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(); - } - //start_table($table_style2, 5, 7); - //echo "