X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=1e1b55628037617eb5a7ed7b74bd20b9f94d438d;hp=d0a0ea8b04e0038429615fdd88c108e1af5f68b2;hb=92f26ce5c76266a8b6e96a6b086aa919095e7316;hpb=91081a4f4f5b896a560d07d213540993351d03cb diff --git a/sales/customer_payments.php b/sales/customer_payments.php index d0a0ea8b..1e1b5562 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -18,14 +18,13 @@ 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) { +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(); } add_js_file('payalloc.js'); @@ -44,22 +43,29 @@ if (isset($_GET['customer_id'])) $_POST['customer_id'] = $_GET['customer_id']; } -if (!isset($_POST['bank_account'])) -{ // first page call - $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,0); +if (!isset($_POST['bank_account'])) { // first page call + $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT, 0, get_post('customer_id')); if (isset($_GET['SInvoice'])) { // get date and supplier - $inv = get_customer_trans($_GET['SInvoice'], ST_SALESINVOICE); - if($inv) { + $type = !isset($_GET['Type']) ? ST_SALESINVOICE : $_GET['Type']; + $cust = !isset($_GET['customer_id']) ? null : $_GET['customer_id']; + $inv = get_customer_trans($_GET['SInvoice'], $type, $cust); + $dflt_act = get_default_bank_account($inv['curr_code']); + $_POST['bank_account'] = $dflt_act['id']; + if ($inv) { $_POST['customer_id'] = $inv['debtor_no']; + $_SESSION['alloc']->set_person($inv['debtor_no'], PT_CUSTOMER); + $_SESSION['alloc']->read(); + $_POST['BranchID'] = $inv['branch_code']; $_POST['DateBanked'] = sql2date($inv['tran_date']); foreach($_SESSION['alloc']->allocs as $line => $trans) { - if ($trans->type == ST_SALESINVOICE && $trans->type_no == $_GET['SInvoice']) { - $_POST['amount'] = - $_SESSION['alloc']->amount = price_format($_SESSION['alloc']->allocs[$line]->amount); - $_SESSION['alloc']->allocs[$line]->current_allocated = - $_SESSION['alloc']->allocs[$line]->amount; + if ($trans->type == $type && $trans->type_no == $_GET['SInvoice']) { + $un_allocated = $trans->amount - $trans->amount_allocated; + if ($un_allocated){ + $_SESSION['alloc']->allocs[$line]->current_allocated = $un_allocated; + $_POST['amount'] = $_POST['amount'.$line] = price_format($un_allocated); + } break; } } @@ -73,12 +79,16 @@ 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']; + $_SESSION['alloc']->person_id = $br['debtor_no']; $Ajax->activate('customer_id'); } if (!isset($_POST['customer_id'])) { - $_SESSION['alloc']->person_id = $_POST['customer_id'] = get_global_customer(false); + $_POST['customer_id'] = get_global_customer(false); + $_SESSION['alloc']->set_person($_POST['customer_id'], PT_CUSTOMER); $_SESSION['alloc']->read(); + $dflt_act = get_default_bank_account($_SESSION['alloc']->person_curr); + $_POST['bank_account'] = $dflt_act['id']; } if (!isset($_POST['DateBanked'])) { $_POST['DateBanked'] = new_doc_date(); @@ -94,14 +104,17 @@ if (isset($_GET['AddedID'])) { display_notification_centered(_("The customer payment has been successfully entered.")); submenu_print(_("&Print This Receipt"), ST_CUSTPAYMENT, $payment_no."-".ST_CUSTPAYMENT, 'prtopt'); + submenu_print(_("&Email This Receipt"), ST_CUSTPAYMENT, $payment_no."-".ST_CUSTPAYMENT, null, 1); - 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"); + submenu_view(_("&View this Customer Payment"), ST_CUSTPAYMENT, $payment_no); - hyperlink_no_params($path_to_root . "/sales/inquiry/customer_allocation_inquiry.php?customer_id=", _("Select Another &Customer Transaction for Payment")); + submenu_option(_("Enter Another &Customer Payment"), "/sales/customer_payments.php"); + submenu_option(_("Enter Other &Deposit"), "/gl/gl_bank.php?NewDeposit=Yes"); + submenu_option(_("Enter Payment to &Supplier"), "/purchasing/supplier_payment.php"); + submenu_option(_("Enter Other &Payment"), "/gl/gl_bank.php?NewPayment=Yes"); + submenu_option(_("Bank Account &Transfer"), "/gl/bank_transfer.php"); - hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment")); + display_note(get_gl_view_str(ST_CUSTPAYMENT, $payment_no, _("&View the GL Journal Entries for this Customer Payment"))); display_footer_exit(); } @@ -136,7 +149,7 @@ function can_process() return false; } - if (!get_post('BranchID')) + if (!get_post('BranchID')) { display_error(_("This customer has no branch defined.")); set_focus('BranchID'); @@ -148,27 +161,12 @@ function can_process() set_focus('DateBanked'); return false; } elseif (!is_date_in_fiscalyear($_POST['DateBanked'])) { - 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('DateBanked'); return false; } - if (!$Refs->is_valid($_POST['ref'])) { - display_error(_("You must enter a reference.")); - set_focus('ref'); - return false; - } - - //Chaitanya : 13-OCT-2011 - To support Edit feature - if (isset($_POST['trans_no']) && $_POST['trans_no'] == 0 && (!is_new_reference($_POST['ref'], ST_CUSTPAYMENT))) { - display_error(_("The entered reference is already in use.")); - set_focus('ref'); - return false; - } - //Avoid duplicate reference while modifying - elseif ($_POST['ref'] != $_POST['old_ref'] && !is_new_reference($_POST['ref'], ST_CUSTPAYMENT)) - { - display_error( _("The entered reference is already in use.")); + if (!check_reference($_POST['ref'], ST_CUSTPAYMENT, @$_POST['trans_no'])) { set_focus('ref'); return false; } @@ -179,13 +177,13 @@ function can_process() return false; } - if (isset($_POST['charge']) && !check_num('charge', 0)) { + if (isset($_POST['charge']) && (!check_num('charge', 0) || $_POST['charge'] == $_POST['amount'])) { 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'); + $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'); @@ -193,14 +191,7 @@ function can_process() } } - 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'] == "") + if (@$_POST['discount'] == "") { $_POST['discount'] = 0; } @@ -211,12 +202,19 @@ function can_process() return false; } - //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.")); + display_error(_("The balance of the amount and discount is zero or negative. Please enter valid amounts.")); set_focus('discount'); return false; } + + if (isset($_POST['bank_amount']) && input_num('bank_amount')<=0) + { + display_error(_("The entered payment amount is zero or negative.")); + set_focus('bank_amount'); + return false; + } + if (!db_has_currency_rates(get_customer_currency($_POST['customer_id']), $_POST['DateBanked'], true)) return false; @@ -234,21 +232,10 @@ if (isset($_POST['_customer_id_button'])) { // unset($_POST['branch_id']); $Ajax->activate('BranchID'); } -if (isset($_POST['_DateBanked_changed'])) { - $Ajax->activate('_ex_rate'); -} //---------------------------------------------------------------------------------------------- if (get_post('AddPaymentItem') && can_process()) { - - $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']); @@ -256,14 +243,13 @@ if (get_post('AddPaymentItem') && can_process()) { //Chaitanya : 13-OCT-2011 - To support Edit feature $payment_no = write_customer_payment($_SESSION['alloc']->trans_no, $_POST['customer_id'], $_POST['BranchID'], $_POST['bank_account'], $_POST['DateBanked'], $_POST['ref'], - input_num('amount'), input_num('discount'), $_POST['memo_'], $rate, input_num('charge')); + input_num('amount'), input_num('discount'), $_POST['memo_'], 0, input_num('charge'), input_num('bank_amount', input_num('amount')), $_POST['dimension_id'], $_POST['dimension2_id']); $_SESSION['alloc']->trans_no = $payment_no; + $_SESSION['alloc']->date_ = $_POST['DateBanked']; $_SESSION['alloc']->write(); unset($_SESSION['alloc']); - //Chaitanya : 13-OCT-2011 - To support Edit feature - //meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no"); meta_forward($_SERVER['PHP_SELF'], $new_pmt ? "AddedID=$payment_no" : "UpdatedID=$payment_no"); } @@ -275,19 +261,19 @@ function read_customer_data() $myrow = get_customer_habit($_POST['customer_id']); - $_POST['HoldAccount'] = $myrow["dissallow_invoices"]; - $_POST['pymt_discount'] = $myrow["pymt_discount"]; - //Chaitanya : 13-OCT-2011 - To support Edit feature - //If page is called first time and New entry fetch the nex reference number + $_POST['HoldAccount'] = !$myrow ? false : $myrow["dissallow_invoices"]; + $_POST['pymt_discount'] = !$myrow ? 0 : $myrow["pymt_descount"]; + // To support Edit feature + // If page is called first time and New entry fetch the nex reference number if (!$_SESSION['alloc']->trans_no && !isset($_POST['charge'])) - $_POST['ref'] = $Refs->get_next(ST_CUSTPAYMENT); + $_POST['ref'] = $Refs->get_next(ST_CUSTPAYMENT, null, array( + 'customer' => get_post('customer_id'), 'date' => get_post('DateBanked'))); } //---------------------------------------------------------------------------------------------- $new = 1; -$old_ref = 0; -//Chaitanya : 13-OCT-2011 - To support Edit feature +// To support Edit feature if (isset($_GET['trans_no']) && $_GET['trans_no'] > 0 ) { $_POST['trans_no'] = $_GET['trans_no']; @@ -299,117 +285,126 @@ if (isset($_GET['trans_no']) && $_GET['trans_no'] > 0 ) $_POST['BranchID'] = $myrow["branch_code"]; $_POST['bank_account'] = $myrow["bank_act"]; $_POST['ref'] = $myrow["reference"]; - $old_ref = $myrow["reference"]; - //$_POST['charge'] = $myrow[""]; + $charge = get_cust_bank_charge(ST_CUSTPAYMENT, $_POST['trans_no']); + $_POST['charge'] = price_format($charge); $_POST['DateBanked'] = sql2date($myrow['tran_date']); $_POST["amount"] = price_format($myrow['Total'] - $myrow['ov_discount']); + $_POST["bank_amount"] = price_format($myrow['bank_amount']+$charge); $_POST["discount"] = price_format($myrow['ov_discount']); $_POST["memo_"] = get_comments_string(ST_CUSTPAYMENT,$_POST['trans_no']); - if (!isset($_POST['charge'])) // first page call + //Prepare allocation cart + if (isset($_POST['trans_no']) && $_POST['trans_no'] > 0 ) + $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,$_POST['trans_no']); + else { - //Prepare allocation cart - if (isset($_POST['trans_no']) && $_POST['trans_no'] > 0 ) - $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,$_POST['trans_no']); - else - { - $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,0); - $Ajax->activate('alloc_tbl'); - } + $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT, $_POST['trans_no']); + $Ajax->activate('alloc_tbl'); } - } //---------------------------------------------------------------------------------------------- $new = !$_SESSION['alloc']->trans_no; start_form(); - hidden('trans_no'); - hidden('old_ref', $old_ref); +hidden('trans_no'); - start_outer_table(TABLESTYLE2, "width=60%", 5); - table_section(1); +start_outer_table(TABLESTYLE2, "width='60%'", 5); - if ($new) - customer_list_row(_("From Customer:"), 'customer_id', null, false, true); - else { - label_cells(_("From Customer:"), $_POST['customer_name'], "class='label'"); - hidden('customer_id', $_POST['customer_id']); - } +table_section(1); - if (list_updated('customer_id') || ($new && list_updated('bank_account'))) { - $_SESSION['alloc']->read(); - $_POST['memo_'] = $_POST['amount'] = $_POST['discount'] = ''; - $Ajax->activate('alloc_tbl'); - } +if ($new) + customer_list_row(_("From Customer:"), 'customer_id', null, false, true); +else { + label_cells(_("From Customer:"), $_SESSION['alloc']->person_name, "class='label'"); + hidden('customer_id', $_POST['customer_id']); +} + +if (db_customer_has_branches($_POST['customer_id'])) { + customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'BranchID', null, false, true, true); +} else { + hidden('BranchID', ANY_NUMERIC); +} - if (db_customer_has_branches($_POST['customer_id'])) { - customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'BranchID', null, false, true, true); - } else { - hidden('BranchID', ANY_NUMERIC); +if (list_updated('customer_id') || ($new && list_updated('bank_account'))) { + $_SESSION['alloc']->set_person($_POST['customer_id'], PT_CUSTOMER); + $_SESSION['alloc']->read(); + $_POST['memo_'] = $_POST['amount'] = $_POST['discount'] = ''; + if (list_updated('customer_id')) { + $dflt_act = get_default_bank_account($_SESSION['alloc']->person_curr); + $_POST['bank_account'] = $dflt_act['id']; } + $Ajax->activate('_page_body'); +} - read_customer_data(); +bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true); - set_global_customer($_POST['customer_id']); - if (isset($_POST['HoldAccount']) && $_POST['HoldAccount'] != 0) - display_warning(_("This customer account is on hold.")); - $display_discount_percent = percent_format($_POST['pymt_discount']*100) . "%"; +read_customer_data(); - table_section(2); - if (!list_updated('bank_account')) - $_POST['bank_account'] = get_default_customer_bank_account($_POST['customer_id']); +set_global_customer($_POST['customer_id']); +if (isset($_POST['HoldAccount']) && $_POST['HoldAccount'] != 0) + display_warning(_("This customer account is on hold.")); +$display_discount_percent = percent_format($_POST['pymt_discount']*100) . "%"; - //Chaitanya : 13-OCT-2011 - Is AJAX call really needed ??? - //bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true); - bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, false); +table_section(2); - text_row(_("Reference:"), 'ref', null, 20, 40); +date_row(_("Date of Deposit:"), 'DateBanked', '', true, 0, 0, 0, null, true); - table_section(3); +ref_row(_("Reference:"), 'ref','' , null, '', ST_CUSTPAYMENT); - date_row(_("Date of Deposit:"), 'DateBanked', '', true, 0, 0, 0, null, true); +table_section(3); - $comp_currency = get_company_currency(); - $cust_currency = get_customer_currency($_POST['customer_id']); - $bank_currency = get_bank_account_currency($_POST['bank_account']); +$comp_currency = get_company_currency(); +$cust_currency = $_SESSION['alloc']->set_person($_POST['customer_id'], PT_CUSTOMER); +if (!$cust_currency) + $cust_currency = $comp_currency; +$_SESSION['alloc']->currency = $bank_currency = get_bank_account_currency($_POST['bank_account']); - if ($cust_currency != $bank_currency) { - exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], ($bank_currency == $comp_currency)); - } +if ($cust_currency != $bank_currency) +{ + amount_row(_("Payment Amount:"), 'bank_amount', null, '', $bank_currency); +} - amount_row(_("Bank Charge:"), 'charge'); +amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency); - end_outer_table(1); +$row = get_customer($_POST['customer_id']); +$_POST['dimension_id'] = !$row ? 0 : $row['dimension_id']; +$_POST['dimension2_id'] = !$row ? 0 : $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); - if ($cust_currency == $bank_currency) { - div_start('alloc_tbl'); - show_allocatable(false); - div_end(); - } +end_outer_table(1); - start_table(TABLESTYLE, "width=60%"); +div_start('alloc_tbl'); +show_allocatable(false); +div_end(); - label_row(_("Customer prompt payment discount :"), $display_discount_percent); - amount_row(_("Amount of Discount:"), 'discount'); +start_table(TABLESTYLE, "width='60%'"); - amount_row(_("Amount:"), 'amount'); +label_row(_("Customer prompt payment discount :"), $display_discount_percent); - textarea_row(_("Memo:"), 'memo_', null, 22, 4); - end_table(1); +amount_row(_("Amount of Discount:"), 'discount', null, '', $cust_currency); - if ($cust_currency != $bank_currency) - display_note(_("Amount and discount are in customer's currency.")); +amount_row(_("Amount:"), 'amount', null, '', $cust_currency); - br(); +textarea_row(_("Memo:"), 'memo_', null, 22, 4); +end_table(1); - if ($new) - submit_center('AddPaymentItem', _("Update Payment"), true, '', 'default'); - else - submit_center('AddPaymentItem', _("Add Payment"), true, '', 'default'); +if ($new) + submit_center('AddPaymentItem', _("Add Payment"), true, '', 'default'); +else + submit_center('AddPaymentItem', _("Update Payment"), true, '', 'default'); - br(); +br(); end_form(); end_page(); -?>