From: Janusz Dobrowolski Date: Fri, 10 Jul 2009 11:01:00 +0000 (+0000) Subject: Added direct allocations X-Git-Tag: v2.4.2~19^2~1338 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=c0d93311185d0657a6ff4a3c1e00c7967738fd27;p=fa-stable.git Added direct allocations --- diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index fca9417f..93cda07e 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'])) { @@ -48,9 +51,25 @@ if (isset($_POST['_supplier_id_editor'])) { 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')) { + get_allocations_for_transaction(22, 0); + $Ajax->activate('alloc_tbl'); +} //---------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) @@ -61,7 +80,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 +89,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 ""; // outer table - start_outer_table($table_style2, 5); - - //echo ""; - table_section(1); - - bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true); - - amount_row(_("Amount of Payment:"), 'amount'); - amount_row(_("Amount of Discount:"), 'discount'); - amount_row(_("Bank Charge:"), 'charge'); - - date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true); - - table_section(2); - - 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'], true); - } - - ref_row(_("Reference:"), 'ref', '', references::get_next(22)); - - textarea_row(_("Memo:"), 'memo_', null, 22, 4); - - end_outer_table(1); // outer table - - submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', 'default'); - - 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'] == "") @@ -201,7 +161,8 @@ function check_inputs() return false; } - return true; + $_SESSION['alloc']->amount = -input_num('amount'); + return check_allocations(); } //---------------------------------------------------------------------------------------- @@ -220,6 +181,9 @@ function handle_add_payment() $_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; + handle_allocate(); //unset($_POST['supplier_id']); unset($_POST['bank_account']); unset($_POST['DatePaid']); @@ -245,7 +209,66 @@ if (isset($_POST['ProcessSuppPayment'])) } } -display_controls(); +//---------------------------------------------------------------------------------------- + +start_form(); + + //start_table($table_style2, 5, 7); + //echo "
"; // outer table + start_outer_table("$table_style2 width=90%", 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)); + + 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."), 2, 0); + } + + submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', 'default'); + +end_form(); end_page(); ?>