X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fcustomer_payments.php;h=b67df99c774a1b3c06c22e2dd64faab2879c7ed9;hb=f36a75347f4940099744e978acb5f043785a4fea;hp=42cb552d8a39bd10a1c61d2df344194b28933fdd;hpb=41709ef0fce9a2bf5bb20ef0fd1f94a54bd50ba0;p=fa-stable.git diff --git a/sales/customer_payments.php b/sales/customer_payments.php index 42cb552d..b67df99c 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -1,13 +1,25 @@ . +***********************************************************************/ +$page_security = 'SA_SALESPAYMNT'; +$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 . "/sales/includes/sales_db.inc"); +//include_once($path_to_root . "/sales/includes/ui/cust_alloc_ui.inc"); +include_once($path_to_root . "/reporting/includes/reporting.inc"); $js = ""; if ($use_popup_windows) { @@ -16,7 +28,9 @@ if ($use_popup_windows) { if ($use_date_picker) { $js .= get_js_date_picker(); } -page(_("Customer Payment Entry"), false, false, "", $js); +add_js_file('payalloc.js'); + +page(_($help_context = "Customer Payment Entry"), false, false, "", $js); //---------------------------------------------------------------------------------------------- @@ -24,19 +38,22 @@ check_db_has_customers(_("There are no customers 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['customer_id'])) - $_POST['customer_id'] = $ret['customer_id']; - if(isset($ret['branch_id'])) - $_POST['BranchID'] = $ret['branch_id']; + +if (list_updated('BranchID')) { + // when branch is selected via external editor also customer can change + $br = get_branch(get_post('BranchID')); + $_POST['customer_id'] = $br['debtor_no']; + $Ajax->activate('customer_id'); } -if (isset($_POST['_customer_id_editor'])) { - context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'], - array( 'customer_id', 'BranchID', 'bank_account', 'DateBanked', - 'ReceiptType', 'ref', 'amount', 'discount', 'memo_') ); + +if (!isset($_POST['customer_id'])) + $_POST['customer_id'] = get_global_customer(false); +if (!isset($_POST['DateBanked'])) { + $_POST['DateBanked'] = new_doc_date(); + if (!is_date_in_fiscalyear($_POST['DateBanked'])) { + $_POST['DateBanked'] = end_fiscalyear(); + } } if (isset($_GET['AddedID'])) { @@ -44,20 +61,37 @@ if (isset($_GET['AddedID'])) { display_notification_centered(_("The customer payment has been successfully entered.")); - display_note(get_gl_view_str(12, $payment_no, _("View the GL Journal Entries for this Customer Payment"))); + submenu_print(_("&Print This Receipt"), ST_CUSTPAYMENT, $payment_no."-".ST_CUSTPAYMENT, 'prtopt'); - hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12"); + display_note(get_gl_view_str(ST_CUSTPAYMENT, $payment_no, _("&View the GL Journal Entries for this Customer Payment"))); - hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another Customer Payment")); - br(1); - end_page(); - exit; +// hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("&Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12"); + + hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment")); + + display_footer_exit(); } //---------------------------------------------------------------------------------------------- function can_process() { + global $Refs; + + if (!get_post('customer_id')) + { + display_error(_("There is no customer selected.")); + set_focus('customer_id'); + return false; + } + + if (!get_post('BranchID')) + { + display_error(_("This customer has no branch defined.")); + set_focus('BranchID'); + return false; + } + if (!isset($_POST['DateBanked']) || !is_date($_POST['DateBanked'])) { display_error(_("The entered date is invalid. Please enter a valid date for the payment.")); set_focus('DateBanked'); @@ -68,13 +102,13 @@ function can_process() 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'], 12)) { + if (!is_new_reference($_POST['ref'], ST_CUSTPAYMENT)) { display_error(_("The entered reference is already in use.")); set_focus('ref'); return false; @@ -86,19 +120,51 @@ function can_process() return false; } + if (isset($_POST['charge']) && !check_num('charge', 0)) { + display_error(_("The entered amount is invalid or negative and cannot be processed.")); + set_focus('charge'); + 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.")); + set_focus('_ex_rate'); + return false; + } + + if ($_POST['discount'] == "") + { + $_POST['discount'] = 0; + } + if (!check_num('discount')) { display_error(_("The entered discount is not a valid number.")); set_focus('discount'); 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 balance of the amount and discout is zero or negative. Please enter valid amounts.")); set_focus('discount'); return false; } - return true; + $_SESSION['alloc']->amount = input_num('amount'); + + if (isset($_POST["TotalNumberOfAllocs"])) + return check_allocations(); + else + return true; } //---------------------------------------------------------------------------------------------- @@ -114,12 +180,33 @@ if (isset($_POST['_customer_id_button'])) { // unset($_POST['branch_id']); $Ajax->activate('BranchID'); } +if (isset($_POST['_DateBanked_changed'])) { + $Ajax->activate('_ex_rate'); +} +if (list_updated('customer_id') || list_updated('bank_account')) { + $_SESSION['alloc']->read(); + $Ajax->activate('alloc_tbl'); +} //---------------------------------------------------------------------------------------------- if (isset($_POST['AddPaymentItem'])) { + + $cust_currency = get_customer_currency($_POST['customer_id']); + $bank_currency = get_bank_account_currency($_POST['bank_account']); + $comp_currency = get_company_currency(); + if ($comp_currency != $bank_currency && $bank_currency != $cust_currency) + $rate = 0; + else + $rate = input_num('_ex_rate'); + + new_doc_date($_POST['DateBanked']); + $payment_no = write_customer_payment(0, $_POST['customer_id'], $_POST['BranchID'], - $_POST['bank_account'], $_POST['DateBanked'], $_POST['ReceiptType'], $_POST['ref'], - input_num('amount'), input_num('discount'), $_POST['memo_']); + $_POST['bank_account'], $_POST['DateBanked'], $_POST['ref'], + input_num('amount'), input_num('discount'), $_POST['memo_'], $rate, input_num('charge')); + + $_SESSION['alloc']->trans_no = $payment_no; + $_SESSION['alloc']->write(); meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no"); } @@ -128,104 +215,91 @@ if (isset($_POST['AddPaymentItem'])) { function read_customer_data() { - $sql = "SELECT ".TB_PREF."debtors_master.pymt_discount, - ".TB_PREF."credit_status.dissallow_invoices - FROM ".TB_PREF."debtors_master, ".TB_PREF."credit_status - WHERE ".TB_PREF."debtors_master.credit_status = ".TB_PREF."credit_status.id - AND ".TB_PREF."debtors_master.debtor_no = '" . $_POST['customer_id'] . "'"; - - $result = db_query($sql, "could not query customers"); + global $Refs; - $myrow = db_fetch($result); + $myrow = get_customer_habit($_POST['customer_id']); $_POST['HoldAccount'] = $myrow["dissallow_invoices"]; $_POST['pymt_discount'] = $myrow["pymt_discount"]; - $_POST['ref'] = references::get_next(12); + $_POST['ref'] = $Refs->get_next(ST_CUSTPAYMENT); } -//------------------------------------------------------------------------------------------------- +//---------------------------------------------------------------------------------------------- + +start_form(); + + start_outer_table(TABLESTYLE2, "width=60%", 5); + table_section(1); -function display_item_form() -{ - global $table_style2; - start_table($table_style2, 5, 7); - echo "