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) {
$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');
$_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);
+ $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']->person_id = $_POST['customer_id'] = $inv['debtor_no'];
+ $_SESSION['alloc']->read();
$_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;
+ $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;
}
}
// 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');
}
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");
+ 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();
}
return false;
}
- if (!get_post('BranchID'))
+ if (!get_post('BranchID'))
{
display_error(_("This customer has no branch defined."));
set_focus('BranchID');
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;
}
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');
// return false;
// }
- if ($_POST['discount'] == "")
+ if (@$_POST['discount'] == "")
{
$_POST['discount'] = 0;
}
// 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']);
$_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');
}
-
}
//----------------------------------------------------------------------------------------------
if ($new)
customer_list_row(_("From Customer:"), 'customer_id', null, false, true);
else {
- label_cells(_("From Customer:"), $_POST['customer_name'], "class='label'");
+ label_cells(_("From Customer:"), $_SESSION['alloc']->person_name, "class='label'");
hidden('customer_id', $_POST['customer_id']);
}
+ if (list_updated('customer_id') || ($new && list_updated('bank_account'))) {
+ $_SESSION['alloc']->read();
+ $_POST['memo_'] = $_POST['amount'] = $_POST['discount'] = '';
+ $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 {
}
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'] = '';
$Ajax->activate('alloc_tbl');
date_row(_("Date of Deposit:"), 'DateBanked', '', true, 0, 0, 0, null, true);
- text_row(_("Reference:"), 'ref', null, 20, 40);
+ ref_row(_("Reference:"), 'ref','' , null, '', ST_CUSTPAYMENT);
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']);
-
-// if ($cust_currency != $bank_currency) {
-// exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], ($bank_currency == $comp_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)
{
amount_row(_("Payment Amount:"), 'bank_amount', null, '', $bank_currency);
- // aproximate value in customer currency:
-// label_row(_("Current value:"), price_format(input_num('bank_amount')*$rate).' '.$cust_currency);
}
amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency);
end_outer_table(1);
- display_heading(sprintf(_("Accounts Receivable settled in %s:"), $cust_currency));
div_start('alloc_tbl');
show_allocatable(false);
div_end();
end_table(1);
if ($new)
- submit_center('AddPaymentItem', _("Update Payment"), true, '', 'default');
- else
submit_center('AddPaymentItem', _("Add Payment"), true, '', 'default');
+ else
+ submit_center('AddPaymentItem', _("Update Payment"), true, '', 'default');
br();
projects / fa-stable.git / blobdiff