X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=d516070a351f8d528c4831bcaecee677056cf932;hb=5189bc26f377d678d0a3d88a2b623d69c0e1a278;hp=28e16c6f3229aad6c1229f0f2cd93aba3ebf60ef;hpb=3334987c69e546f973dac393a72f10702d9e73b8;p=fa-stable.git diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index 28e16c6f..d516070a 100644 --- a/purchasing/supplier_payment.php +++ b/purchasing/supplier_payment.php @@ -1,22 +1,34 @@ . +***********************************************************************/ +$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) +if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(900, 500); -if ($use_date_picker) +if (user_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'])) { @@ -29,106 +41,93 @@ 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.")); -check_db_has_bank_trans_types(_("There are no bank payment types 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', - 'PaymentType', '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, get_post('supplier_id')); + + if (isset($_GET['PInvoice'])) { + // get date and supplier + $inv = get_supp_trans($_GET['PInvoice'], $_GET['trans_type']); + if ($inv) { + $_SESSION['alloc']->person_id = $_POST['supplier_id'] = $inv['supplier_id']; + $_SESSION['alloc']->read(); + $_POST['DatePaid'] = sql2date($inv['tran_date']); + $_POST['memo_'] = $inv['supp_reference']; + foreach($_SESSION['alloc']->allocs as $line => $trans) { + if ($trans->type == $_GET['trans_type'] && $trans->type_no == $_GET['PInvoice']) { + $un_allocated = abs($trans->amount) - $trans->amount_allocated; + $_SESSION['alloc']->amount = $_SESSION['alloc']->allocs[$line]->current_allocated = $un_allocated; + $_POST['amount'] = $_POST['amount'.$line] = price_format($un_allocated); + 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); - hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("Allocate this Payment"), "trans_no=$payment_id&trans_type=22"); + submenu_view(_("View this Payment"), ST_SUPPAYMENT, $payment_id); + display_note(get_gl_view_str(ST_SUPPAYMENT, $payment_id, _("View the GL &Journal Entries for this Payment")), 0, 1); - hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier payment"), "supplier_id=" . $_POST['supplier_id']); + submenu_option(_("Enter another supplier &payment"), "/purchasing/supplier_payment.php?supplier_id=".$_POST['supplier_id']); + submenu_option(_("Enter Other &Payment"), "/gl/gl_bank.php?NewPayment=Yes"); + submenu_option(_("Enter &Customer Payment"), "/sales/customer_payments.php"); + submenu_option(_("Enter Other &Deposit"), "/gl/gl_bank.php?NewDeposit=Yes"); + submenu_option(_("Bank Account &Transfer"), "/gl/bank_transfer.php"); display_footer_exit(); } //---------------------------------------------------------------------------------------- -function display_controls() +function get_default_supplier_payment_bank_account($supplier_id, $date) { - global $table_style2; - start_form(false, true); - - if (!isset($_POST['supplier_id'])) - $_POST['supplier_id'] = get_global_supplier(false); - if (!isset($_POST['DatePaid'])) + $previous_payment = get_supp_payment_before($supplier_id, date2sql($date)); + if ($previous_payment) { - $_POST['DatePaid'] = Today(); - if (!is_date_in_fiscalyear($_POST['DatePaid'])) - $_POST['DatePaid'] = end_fiscalyear(); - } - start_table($table_style2, 5, 7); - echo ""; // outer table - - echo ""; - - 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); - - echo "
"; - echo ""; // outer table - echo ""; - - 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']); - } - - bank_trans_types_list_row(_("Payment Type:"), 'PaymentType', null); - - ref_row(_("Reference:"), 'ref', '', references::get_next(22)); - - text_row(_("Memo:"), 'memo_', null, 52,50); - - echo "
"; - - echo ""; - end_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); + return $previous_payment['bank_id']; } - - end_form(); + return get_default_supplier_bank_account($supplier_id); } - //---------------------------------------------------------------------------------------- function check_inputs() { - if ($_POST['amount'] == "") + 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); } @@ -140,7 +139,22 @@ function check_inputs() return false; } - if ($_POST['discount'] == "") + 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_bank_charge_account($_POST['bank_account']); + 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 (@$_POST['discount'] == "") { $_POST['discount'] = 0; } @@ -152,13 +166,22 @@ 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 negative. Please enter positive values.")); + display_error(_("The total of the amount and the discount is zero or negative. Please enter positive values.")); set_focus('amount'); return false; } + if (isset($_POST['bank_amount']) && input_num('bank_amount')<=0) + { + display_error(_("The entered bank amount is zero or negative.")); + set_focus('bank_amount'); + return false; + } + + if (!is_date($_POST['DatePaid'])) { display_error(_("The entered date is invalid.")); @@ -167,39 +190,52 @@ function check_inputs() } elseif (!is_date_in_fiscalyear($_POST['DatePaid'])) { - display_error(_("The entered date is not in fiscal year.")); + display_error(_("The entered date is out of fiscal year or is closed for further data entry.")); set_focus('DatePaid'); return false; } - if (!references::is_valid($_POST['ref'])) - { - display_error(_("You must enter a reference.")); - set_focus('ref'); + + $limit = get_bank_account_limit($_POST['bank_account'], $_POST['DatePaid']); + + if (($limit !== null) && (floatcmp($limit, input_num('amount')) < 0)) + { + display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit))); + set_focus('amount'); return false; } - if (!is_new_reference($_POST['ref'], 22)) + if (!check_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; } //---------------------------------------------------------------------------------------- function handle_add_payment() { - $payment_id = add_supp_payment($_POST['supplier_id'], $_POST['DatePaid'], - $_POST['PaymentType'], $_POST['bank_account'], - input_num('amount'), input_num('discount'), $_POST['ref'], $_POST['memo_']); + $payment_id = write_supp_payment(0, $_POST['supplier_id'], $_POST['bank_account'], + $_POST['DatePaid'], $_POST['ref'], input_num('amount'), input_num('discount'), $_POST['memo_'], + input_num('charge'), input_num('bank_amount', input_num('amount')), $_POST['dimension_id'], $_POST['dimension2_id']); + new_doc_date($_POST['DatePaid']); + + $_SESSION['alloc']->trans_no = $payment_id; + $_SESSION['alloc']->date_ = $_POST['DatePaid']; + $_SESSION['alloc']->write(); - //unset($_POST['supplier_id']); unset($_POST['bank_account']); unset($_POST['DatePaid']); - unset($_POST['PaymentType']); unset($_POST['currency']); unset($_POST['memo_']); unset($_POST['amount']); @@ -222,7 +258,95 @@ 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')) { + $_POST['amount'] = price_format(0); + $_SESSION['alloc']->person_id = get_post('supplier_id'); + $Ajax->activate('amount'); + } elseif (list_updated('bank_account')) + $Ajax->activate('alloc_tbl'); + + 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') && !get_post('__ex_rate_changed')) + { + $_POST['bank_account'] = get_default_supplier_payment_bank_account($_POST['supplier_id'], $_POST['DatePaid']); + } else + { + $_POST['amount'] = price_format(0); + } + + bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true); + + bank_balance_row($_POST['bank_account']); + + table_section(2); + + date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true); + + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT, null, + array('supplier'=>get_post('supplier_id'), 'date'=>get_post('DatePaid'))), false, ST_SUPPAYMENT); + + + table_section(3); + + $comp_currency = get_company_currency(); + $supplier_currency = $_SESSION['alloc']->set_person($_POST['supplier_id'], PT_SUPPLIER); + if (!$supplier_currency) + $supplier_currency = $comp_currency; + $_SESSION['alloc']->currency = $bank_currency = get_bank_account_currency($_POST['bank_account']); + + if ($bank_currency != $supplier_currency) + { + amount_row(_("Bank Amount:"), 'bank_amount', null, '', $bank_currency); + } + + amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency); + + $row = get_supplier($_POST['supplier_id']); + $_POST['dimension_id'] = @$row['dimension_id']; + $_POST['dimension2_id'] = @$row['dimension2_id']; + $dim = get_company_pref('use_dimension'); + if ($dim > 0) + dimensions_list_row(_("Dimension").":", 'dimension_id', + null, true, ' ', false, 1, false); + else + hidden('dimension_id', 0); + if ($dim > 1) + dimensions_list_row(_("Dimension")." 2:", 'dimension2_id', + null, true, ' ', false, 2, false); + else + hidden('dimension2_id', 0); + + end_outer_table(1); + + div_start('alloc_tbl'); + show_allocatable(false); + div_end(); + + start_table(TABLESTYLE, "width='60%'"); + amount_row(_("Amount of Discount:"), 'discount', null, '', $supplier_currency); + amount_row(_("Amount of Payment:"), 'amount', null, '', $supplier_currency); + textarea_row(_("Memo:"), 'memo_', null, 22, 4); + end_table(1); + + submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', 'default'); + +end_form(); end_page(); -?>