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;
}
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();
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);
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;
//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']);
$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']))
$_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');
}
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');