X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=f00a88dab6364a8a6e51674adb1531c8e4047e3f;hb=389721f442ea4dc96ba1cafd65919e717e0d8746;hp=03639e75482a03983bf9c3c89b23af3a34b7a138;hpb=45e45a854c40a7a2f9cc8f11e07a259c6923babd;p=fa-stable.git diff --git a/sales/customer_payments.php b/sales/customer_payments.php index 03639e75..f00a88da 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -1,13 +1,24 @@ . +***********************************************************************/ $path_to_root=".."; $page_security = 3; +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"); $js = ""; if ($use_popup_windows) { @@ -16,6 +27,8 @@ if ($use_popup_windows) { if ($use_date_picker) { $js .= get_js_date_picker(); } +add_js_file('payalloc.js'); + page(_("Customer Payment Entry"), false, false, "", $js); //---------------------------------------------------------------------------------------------- @@ -25,16 +38,21 @@ 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.")); //---------------------------------------------------------------------------------------- -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', - '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,7 +62,7 @@ if (isset($_GET['AddedID'])) { 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_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); @@ -84,6 +102,24 @@ 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['_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'); @@ -96,7 +132,8 @@ function can_process() return false; } - return true; + $_SESSION['alloc']->amount = input_num('amount'); + return check_allocations(); } //---------------------------------------------------------------------------------------------- @@ -115,12 +152,31 @@ if (isset($_POST['_customer_id_button'])) { 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['ref'], - input_num('amount'), input_num('discount'), $_POST['memo_']); + 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"); } @@ -143,25 +199,17 @@ function read_customer_data() $_POST['ref'] = references::get_next(12); } -//------------------------------------------------------------------------------------------------- +//---------------------------------------------------------------------------------------------- + +start_form(); + + start_outer_table("$table_style2 width=60%", 5); + table_section(1); -function display_item_form() -{ - global $table_style2; - start_table($table_style2, 5, 7); - echo "