X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=a01bd2896df7df19760a7caa17dc94ce56f54b19;hb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;hp=5c7b55ba31b672c261adccae067a489ae16940b0;hpb=d32bf2c6c188b2cbefc6f1c3e423027828a1bf76;p=fa-stable.git diff --git a/sales/customer_payments.php b/sales/customer_payments.php index 5c7b55ba..a01bd289 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$path_to_root=".."; -$page_security = 3; +$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"); @@ -38,16 +38,12 @@ 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 (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 (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'])) @@ -64,7 +60,7 @@ 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"))); + display_note(get_gl_view_str(ST_CUSTPAYMENT, $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"); @@ -78,6 +74,8 @@ if (isset($_GET['AddedID'])) { function can_process() { + global $Refs; + 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'); @@ -88,13 +86,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; @@ -111,6 +109,14 @@ function can_process() 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)) { @@ -137,7 +143,11 @@ function can_process() } $_SESSION['alloc']->amount = input_num('amount'); - return check_allocations(); + + if (isset($_POST["TotalNumberOfAllocs"])) + return check_allocations(); + else + return true; } //---------------------------------------------------------------------------------------------- @@ -157,7 +167,7 @@ if (isset($_POST['_DateBanked_changed'])) { $Ajax->activate('_ex_rate'); } if (list_updated('customer_id') || list_updated('bank_account')) { - get_allocations_for_transaction(12, 0); + $_SESSION['alloc']->read(); $Ajax->activate('alloc_tbl'); } //---------------------------------------------------------------------------------------------- @@ -179,7 +189,7 @@ if (isset($_POST['AddPaymentItem'])) { input_num('amount'), input_num('discount'), $_POST['memo_'], $rate, input_num('charge')); $_SESSION['alloc']->trans_no = $payment_no; - handle_allocate(); + $_SESSION['alloc']->write(); meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no"); } @@ -188,11 +198,13 @@ if (isset($_POST['AddPaymentItem'])) { function read_customer_data() { + global $Refs; + $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'] . "'"; + AND ".TB_PREF."debtors_master.debtor_no = ".db_escape($_POST['customer_id']); $result = db_query($sql, "could not query customers"); @@ -200,23 +212,24 @@ function read_customer_data() $_POST['HoldAccount'] = $myrow["dissallow_invoices"]; $_POST['pymt_discount'] = $myrow["pymt_discount"]; - $_POST['ref'] = references::get_next(12); + $_POST['ref'] = $Refs->get_next(12); } //---------------------------------------------------------------------------------------------- start_form(); - start_outer_table($table_style2, 5); + start_outer_table("$table_style2 width=60%", 5); table_section(1); customer_list_row(_("From Customer:"), 'customer_id', null, false, true); if (!isset($_POST['bank_account'])) // first page call - get_allocations_for_transaction(12, 0); + $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,0); + if (db_customer_has_branches($_POST['customer_id'])) { customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'BranchID', null, false, true, true); } else { - hidden('BranchID', reserved_words::get_any_numeric()); + hidden('BranchID', ANY_NUMERIC); } read_customer_data(); @@ -241,11 +254,12 @@ start_form(); + $comp_currency = get_company_currency(); $cust_currency = get_customer_currency($_POST['customer_id']); $bank_currency = get_bank_account_currency($_POST['bank_account']); if ($cust_currency != $bank_currency) { - exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], true); + exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], ($bank_currency == $comp_currency)); } amount_row(_("Bank Charge:"), 'charge');