X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=sales%2Fcustomer_payments.php;h=cd7d7dc3e0bba54de307af84327a0e9a52c0ec36;hb=4098636a10a25952a38e1b0c8f6e80dff44ae4e7;hp=7153e4576b712f8cf220d2a28ebcc43b30c503a3;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/sales/customer_payments.php b/sales/customer_payments.php index 7153e457..cd7d7dc3 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -1,20 +1,30 @@ . +***********************************************************************/ $path_to_root=".."; $page_security = 3; 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"); $js = ""; -if ($use_popup_windows) +if ($use_popup_windows) { $js .= get_js_open_window(900, 500); +} +if ($use_date_picker) { + $js .= get_js_date_picker(); +} page(_("Customer Payment Entry"), false, false, "", $js); //---------------------------------------------------------------------------------------------- @@ -23,69 +33,87 @@ 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 (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', + 'ref', 'amount', 'discount', 'memo_') ); +} -if (isset($_GET['AddedID'])) -{ +if (isset($_GET['AddedID'])) { $payment_no = $_GET['AddedID']; display_notification_centered(_("The customer payment has been successfully entered.")); - display_note(get_gl_view_str(systypes::cust_payment(), $payment_no, _("View the GL Journal Entries for this Customer Payment"))); - hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=" . systypes::cust_payment()); - hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another Customer Payment")); + display_note(get_gl_view_str(12, $payment_no, _("&View the GL Journal Entries for this Customer Payment"))); + + 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")); br(1); end_page(); - exit; + exit; } //---------------------------------------------------------------------------------------------- function can_process() { - if (!isset($_POST['DateBanked']) || !is_date($_POST['DateBanked'])) - { + 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'); return false; - } - elseif (!is_date_in_fiscalyear($_POST['DateBanked'])) - { + } elseif (!is_date_in_fiscalyear($_POST['DateBanked'])) { display_error(_("The entered date is not in fiscal year.")); + set_focus('DateBanked'); return false; } - if (!references::is_valid($_POST['ref'])) - { + if (!references::is_valid($_POST['ref'])) { display_error(_("You must enter a reference.")); + set_focus('ref'); return false; } - if (!is_new_reference($_POST['ref'], systypes::cust_payment())) - { + if (!is_new_reference($_POST['ref'], 12)) { display_error(_("The entered reference is already in use.")); + set_focus('ref'); return false; } - if ((!is_numeric($_POST['amount']) || $_POST['amount'] < 0)) - { + if (!check_num('amount', 0)) { display_error(_("The entered amount is invalid or negative and cannot be processed.")); + set_focus('amount'); return false; } - if (!isset($_POST['discount']) || ($_POST['discount'] == "")) - $_POST['discount'] = 0; + 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 (!is_numeric($_POST['discount'])) + 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 (($_POST['amount'] - $_POST['discount'] <= 0)) - { + if ((input_num('amount') - input_num('discount') <= 0)) { display_error(_("The balance of the amount and discout is zero or negative. Please enter valid amounts.")); + set_focus('discount'); return false; } @@ -95,21 +123,36 @@ function can_process() //---------------------------------------------------------------------------------------------- // validate inputs -if (isset($_POST['AddPaymentItem'])) -{ +if (isset($_POST['AddPaymentItem'])) { - if (!can_process()) + if (!can_process()) { unset($_POST['AddPaymentItem']); + } +} +if (isset($_POST['_customer_id_button'])) { +// unset($_POST['branch_id']); + $Ajax->activate('BranchID'); +} +if (isset($_POST['_DateBanked_changed'])) { + $Ajax->activate('_ex_rate'); } - //---------------------------------------------------------------------------------------------- -if (isset($_POST['AddPaymentItem'])) -{ - $payment_no = add_customer_payment($_POST['customer_id'], $_POST['BranchID'], - $_POST['bank_account'], $_POST['DateBanked'], $_POST['ReceiptType'], $_POST['ref'], - $_POST['amount'], $_POST['discount'], $_POST['memo_']); +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['ref'], + input_num('amount'), input_num('discount'), $_POST['memo_'], $rate); meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no"); } @@ -129,7 +172,7 @@ function read_customer_data() $_POST['HoldAccount'] = $myrow["dissallow_invoices"]; $_POST['pymt_discount'] = $myrow["pymt_discount"]; - $_POST['ref'] = references::get_next(systypes::cust_payment()); + $_POST['ref'] = references::get_next(12); } //------------------------------------------------------------------------------------------------- @@ -137,85 +180,68 @@ function read_customer_data() function display_item_form() { global $table_style2; - start_table($table_style2, 5, 7); - echo "