X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=b9f945f8d34bdae28866d33714059c6cb2fb4c0c;hb=d1de4b72e5fa6b5952c75b7c79479935bdd0d9d8;hp=5e5d3b9d5b7c8d03e08c58b7139c03445275b81a;hpb=2964f4b6a618414e433bc98145dd845541d9d7b7;p=fa-stable.git diff --git a/sales/customer_payments.php b/sales/customer_payments.php index 5e5d3b9d..b9f945f8 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -48,16 +48,19 @@ if (!isset($_POST['bank_account'])) { // first page call if (isset($_GET['SInvoice'])) { // get date and supplier - $inv = get_customer_trans($_GET['SInvoice'], ST_SALESINVOICE); + $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) { - $_SESSION['alloc']->person_id = $_POST['customer_id'] = $inv['debtor_no']; + 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']) { + 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; @@ -81,8 +84,11 @@ if (list_updated('BranchID')) { } 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(); @@ -98,16 +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); submenu_view(_("&View this Customer Payment"), ST_CUSTPAYMENT, $payment_no); + display_note(get_gl_view_str(ST_CUSTPAYMENT, $payment_no, _("&View the GL Journal Entries for this Customer Payment")), 0, 1); 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"); - - display_note(get_gl_view_str(ST_CUSTPAYMENT, $payment_no, _("&View the GL Journal Entries for this Customer Payment"))); + submenu_option(_("Add an Attachment"), "/admin/attachments.php?filterType=".ST_CUSTPAYMENT."&trans_no=$payment_no"); display_footer_exit(); } @@ -170,7 +177,7 @@ 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; @@ -236,9 +243,10 @@ 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_'], 0, input_num('charge'), input_num('bank_amount', input_num('amount'))); + 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']); @@ -253,8 +261,8 @@ function read_customer_data() $myrow = get_customer_habit($_POST['customer_id']); - $_POST['HoldAccount'] = $myrow["dissallow_invoices"]; - $_POST['pymt_discount'] = $myrow["pymt_discount"]; + $_POST['HoldAccount'] = !$myrow ? false : $myrow["dissallow_invoices"]; + $_POST['pymt_discount'] = !$myrow ? 0 : $myrow["pymt_discount"]; // 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'])) @@ -322,8 +330,10 @@ 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')) - $_POST['bank_account'] = get_default_bank_account($_SESSION['alloc']->person_curr); + 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'); } @@ -357,6 +367,21 @@ if ($cust_currency != $bank_currency) amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency); +$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); + end_outer_table(1); div_start('alloc_tbl');