X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=e73cccd1a5b6b745375200c1b9354b48f284d144;hb=f75695448532371e64f0d3033b88389a62d41da3;hp=3aa23110b78b606fcc03b602b8f4bd4137a082b3;hpb=a5e307dbec066b7a47b911b889e380a6ff2fcede;p=fa-stable.git diff --git a/sales/customer_payments.php b/sales/customer_payments.php index 3aa23110..e73cccd1 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -39,6 +39,35 @@ 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 (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($_GET['SInvoice'])) { + // get date and supplier + $inv = get_customer_trans($_GET['SInvoice'], ST_SALESINVOICE); + if($inv) { + $_POST['customer_id'] = $inv['debtor_no']; + $_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; + break; + } + } + unset($inv); + } else + display_error(_("Invalid sales invoice number.")); + } +} if (list_updated('BranchID')) { // when branch is selected via external editor also customer can change @@ -56,6 +85,7 @@ if (!isset($_POST['DateBanked'])) { } } + if (isset($_GET['AddedID'])) { $payment_no = $_GET['AddedID']; @@ -65,6 +95,21 @@ if (isset($_GET['AddedID'])) { 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"); + + hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment")); + + display_footer_exit(); +} +elseif (isset($_GET['UpdatedID'])) { + $payment_no = $_GET['UpdatedID']; + + display_notification_centered(_("The customer payment has been successfully updated.")); + + submenu_print(_("&Print This Receipt"), ST_CUSTPAYMENT, $payment_no."-".ST_CUSTPAYMENT, 'prtopt'); + + 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"); hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment")); @@ -78,7 +123,7 @@ function can_process() { global $Refs; - if (!get_post('customer_id')) + if (!get_post('customer_id')) { display_error(_("There is no customer selected.")); set_focus('customer_id'); @@ -108,11 +153,19 @@ function can_process() return false; } - if (!is_new_reference($_POST['ref'], ST_CUSTPAYMENT)) { + //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.")); + set_focus('ref'); + return false; + } if (!check_num('amount', 0)) { display_error(_("The entered amount is invalid or negative and cannot be processed.")); @@ -183,8 +236,22 @@ if (isset($_POST['_customer_id_button'])) { if (isset($_POST['_DateBanked_changed'])) { $Ajax->activate('_ex_rate'); } -if (list_updated('customer_id') || list_updated('bank_account')) { + +//Chaitanya : 13-OCT-2011 - To support Edit feature +if (isset($_POST['ref']) && $_SESSION['alloc']->trans_no == 0) // added by Joe to fix the browser back button +{ + $tno = get_customer_trans_from_ref(ST_CUSTPAYMENT, $_POST['ref']); + if ($tno != false) + { + display_error( _("The entered reference is already in use.")); + display_footer_exit(); + } +} +$new = $_SESSION['alloc']->trans_no == 0; + +if (list_updated('customer_id') || ($new && list_updated('bank_account'))) { $_SESSION['alloc']->read(); + $_POST['memo_'] = $_POST['amount'] = $_POST['discount'] = ''; $Ajax->activate('alloc_tbl'); } //---------------------------------------------------------------------------------------------- @@ -201,40 +268,94 @@ if (isset($_POST['AddPaymentItem'])) { new_doc_date($_POST['DateBanked']); - $payment_no = write_customer_payment(0, $_POST['customer_id'], $_POST['BranchID'], + //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')); $_SESSION['alloc']->trans_no = $payment_no; $_SESSION['alloc']->write(); + + unset($_POST); + unset($_SESSION); - meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no"); + //Chaitanya : 13-OCT-2011 - To support Edit feature + //meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no"); + meta_forward($_SERVER['PHP_SELF'], $new ? "AddedID=$payment_no" : "UpdatedID=$payment_no"); } //---------------------------------------------------------------------------------------------- function read_customer_data() { - global $Refs; + global $Refs, $new; $myrow = get_customer_habit($_POST['customer_id']); $_POST['HoldAccount'] = $myrow["dissallow_invoices"]; $_POST['pymt_discount'] = $myrow["pymt_discount"]; - $_POST['ref'] = $Refs->get_next(ST_CUSTPAYMENT); + //Chaitanya : 13-OCT-2011 - To support Edit feature + //If page is called first time and New entry fetch the nex reference number + if ($new && !isset($_POST['charge'])) + $_POST['ref'] = $Refs->get_next(ST_CUSTPAYMENT); +} + +//---------------------------------------------------------------------------------------------- +$new = 1; +$old_ref = 0; + +//Chaitanya : 13-OCT-2011 - To support Edit feature +if (isset($_GET['trans_no']) && $_GET['trans_no'] > 0 ) + $_POST['trans_no'] = $_GET['trans_no']; +//Read data +if (isset($_POST['trans_no']) && $_POST['trans_no'] > 0 ) +{ + $new = 0; + $myrow = get_customer_trans($_POST['trans_no'], ST_CUSTPAYMENT); + $_POST['customer_id'] = $myrow["debtor_no"]; + $_POST['customer_name'] = $myrow["DebtorName"]; + $_POST['BranchID'] = $myrow["branch_code"]; + $_POST['bank_account'] = $myrow["bank_act"]; + $_POST['ref'] = $myrow["reference"]; + $old_ref = $myrow["reference"]; + //$_POST['charge'] = $myrow[""]; + $_POST['DateBanked'] = sql2date($myrow['tran_date']); + $_POST["amount"] = price_format($myrow['Total'] - $myrow['ov_discount']); + $_POST["discount"] = price_format($myrow['ov_discount']); + $_POST["memo_"] = get_comments_string(ST_CUSTPAYMENT,$_POST['trans_no']); } +else + $_POST['trans_no'] = 0; //---------------------------------------------------------------------------------------------- start_form(); + hidden('trans_no', $_POST['trans_no']); + hidden('old_ref', $old_ref); + start_outer_table(TABLESTYLE2, "width=60%", 5); table_section(1); - customer_list_row(_("From Customer:"), 'customer_id', null, false, true); - if (!isset($_POST['bank_account'])) // first page call - $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,0); + 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']); + } + 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 + { + $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,0); + $Ajax->activate('alloc_tbl'); + } + } + if (db_customer_has_branches($_POST['customer_id'])) { customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'BranchID', null, false, true, true); } else { @@ -252,9 +373,11 @@ start_form(); table_section(2); if (!list_updated('bank_account')) - $_POST['bank_account'] = get_default_customer_bank_account($_POST['customer_id']); - bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true); - + $_POST['bank_account'] = get_default_customer_bank_account($_POST['customer_id']); + + //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); text_row(_("Reference:"), 'ref', null, 20, 40); @@ -262,8 +385,6 @@ start_form(); date_row(_("Date of Deposit:"), 'DateBanked', '', true, 0, 0, 0, null, true); - - $comp_currency = get_company_currency(); $cust_currency = get_customer_currency($_POST['customer_id']); $bank_currency = get_bank_account_currency($_POST['bank_account']); @@ -297,7 +418,10 @@ start_form(); br(); - submit_center('AddPaymentItem', _("Add Payment"), true, '', 'default'); + if (isset($_POST['trans_no']) && $_POST['trans_no'] > 0 ) + submit_center('AddPaymentItem', _("Update Payment"), true, '', 'default'); + else + submit_center('AddPaymentItem', _("Add Payment"), true, '', 'default'); } br();