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');
$Ajax->activate('_ex_rate');
}
-if (list_updated('supplier_id') || list_updated('bank_account')) {
- $_SESSION['alloc']->read();
- $_POST['memo_'] = $_POST['amount'] = '';
- $Ajax->activate('alloc_tbl');
-}
//----------------------------------------------------------------------------------------
if (!isset($_POST['bank_account'])) { // first page call
- $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0);
+ $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0, get_post('supplier_id'));
if (isset($_GET['PInvoice'])) {
// get date and supplier
- $inv = get_supp_trans($_GET['PInvoice'], ST_SUPPINVOICE);
- if($inv) {
- $_POST['supplier_id'] = $inv['supplier_id'];
+ $inv = get_supp_trans($_GET['PInvoice'], $_GET['trans_type']);
+ if ($inv) {
+ $_SESSION['alloc']->person_id = $_POST['supplier_id'] = $inv['supplier_id'];
+ $_SESSION['alloc']->read();
$_POST['DatePaid'] = sql2date($inv['tran_date']);
-// $_POST['discount'] = price_format(0);
-// $_POST['bank_account'], $_POST['ref']
$_POST['memo_'] = $inv['supp_reference'];
foreach($_SESSION['alloc']->allocs as $line => $trans) {
- if ($trans->type == ST_SUPPINVOICE && $trans->type_no == $_GET['PInvoice']) {
- $_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 == $_GET['trans_type'] && $trans->type_no == $_GET['PInvoice']) {
+ $un_allocated = abs($trans->amount) - $trans->amount_allocated;
+ $_SESSION['alloc']->amount = $_SESSION['alloc']->allocs[$line]->current_allocated = $un_allocated;
+ $_POST['amount'] = $_POST['amount'.$line] = price_format($un_allocated);
break;
}
}
submenu_print(_("&Print This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, 'prtopt');
submenu_print(_("&Email This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, null, 1);
- display_note(get_gl_view_str(ST_SUPPAYMENT, $payment_id, _("View the GL &Journal Entries for this Payment")));
-
-// hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22");
+ submenu_view(_("View this Payment"), ST_SUPPAYMENT, $payment_id);
+ display_note(get_gl_view_str(ST_SUPPAYMENT, $payment_id, _("View the GL &Journal Entries for this Payment")), 0, 1);
- hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier &payment"), "supplier_id=" . $_POST['supplier_id']);
+ submenu_option(_("Enter another supplier &payment"), "/purchasing/supplier_payment.php?supplier_id=".$_POST['supplier_id']);
+ submenu_option(_("Enter Other &Payment"), "/gl/gl_bank.php?NewPayment=Yes");
+ submenu_option(_("Enter &Customer Payment"), "/sales/customer_payments.php");
+ submenu_option(_("Enter Other &Deposit"), "/gl/gl_bank.php?NewDeposit=Yes");
+ submenu_option(_("Bank Account &Transfer"), "/gl/bank_transfer.php");
display_footer_exit();
}
//----------------------------------------------------------------------------------------
+function get_default_supplier_payment_bank_account($supplier_id, $date)
+{
+ $previous_payment = get_supp_payment_before($supplier_id, date2sql($date));
+ if ($previous_payment)
+ {
+ return $previous_payment['bank_id'];
+ }
+ return get_default_supplier_bank_account($supplier_id);
+}
+//----------------------------------------------------------------------------------------
+
function check_inputs()
{
global $Refs;
return false;
}
- if ($_POST['amount'] == "")
+ if (@$_POST['amount'] == "")
{
$_POST['amount'] = price_format(0);
}
}
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');
}
}
- 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;
}
return false;
}
+ if (isset($_POST['bank_amount']) && input_num('bank_amount')<=0)
+ {
+ display_error(_("The entered bank amount is zero or negative."));
+ set_focus('bank_amount');
+ return false;
+ }
+
+
if (!is_date($_POST['DatePaid']))
{
display_error(_("The entered date is invalid."));
}
elseif (!is_date_in_fiscalyear($_POST['DatePaid']))
{
- 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('DatePaid');
return false;
}
$limit = get_bank_account_limit($_POST['bank_account'], $_POST['DatePaid']);
- if ($limit != null && ($limit < input_num('amount')))
+ if (($limit !== null) && (floatcmp($limit, input_num('amount')) < 0))
{
display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit)));
set_focus('amount');
return false;
}
- if (!$Refs->is_valid($_POST['ref']))
- {
- display_error(_("You must enter a reference."));
+ if (!check_reference($_POST['ref'], ST_SUPPAYMENT))
+ {
set_focus('ref');
return false;
}
- if (!is_new_reference($_POST['ref'], ST_SUPPAYMENT))
- {
- display_error(_("The entered reference is already in use."));
- set_focus('ref');
+ if (!db_has_currency_rates(get_supplier_currency($_POST['supplier_id']), $_POST['DatePaid'], true))
return false;
- }
$_SESSION['alloc']->amount = -input_num('amount');
function handle_add_payment()
{
- $supp_currency = get_supplier_currency($_POST['supplier_id']);
- $bank_currency = get_bank_account_currency($_POST['bank_account']);
- $comp_currency = get_company_currency();
- if ($comp_currency != $bank_currency && $bank_currency != $supp_currency)
- $rate = 0;
- else
- $rate = input_num('_ex_rate');
-
- $payment_id = add_supp_payment($_POST['supplier_id'], $_POST['DatePaid'],
- $_POST['bank_account'], input_num('amount'), input_num('discount'),
- $_POST['ref'], $_POST['memo_'], $rate, input_num('charge'));
+ $payment_id = write_supp_payment(0, $_POST['supplier_id'], $_POST['bank_account'],
+ $_POST['DatePaid'], $_POST['ref'], input_num('amount'), input_num('discount'), $_POST['memo_'],
+ input_num('charge'), input_num('bank_amount', input_num('amount')), $_POST['dimension_id'], $_POST['dimension2_id']);
new_doc_date($_POST['DatePaid']);
$_SESSION['alloc']->trans_no = $payment_id;
+ $_SESSION['alloc']->date_ = $_POST['DatePaid'];
$_SESSION['alloc']->write();
- //unset($_POST['supplier_id']);
+
unset($_POST['bank_account']);
unset($_POST['DatePaid']);
unset($_POST['currency']);
start_form();
- start_outer_table(TABLESTYLE2, "width=60%", 5);
+ start_outer_table(TABLESTYLE2, "width='60%'", 5);
table_section(1);
supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
+ if (list_updated('supplier_id')) {
+ $_POST['amount'] = price_format(0);
+ $_SESSION['alloc']->person_id = get_post('supplier_id');
+ $Ajax->activate('amount');
+ } elseif (list_updated('bank_account'))
+ $Ajax->activate('alloc_tbl');
+
+ if (list_updated('supplier_id') || list_updated('bank_account')) {
+ $_SESSION['alloc']->read();
+ $_POST['memo_'] = $_POST['amount'] = '';
+ $Ajax->activate('alloc_tbl');
+ }
+
set_global_supplier($_POST['supplier_id']);
-
- if (!list_updated('bank_account'))
- $_POST['bank_account'] = get_default_supplier_bank_account($_POST['supplier_id']);
-
+
+ if (!list_updated('bank_account') && !get_post('__ex_rate_changed'))
+ {
+ $_POST['bank_account'] = get_default_supplier_payment_bank_account($_POST['supplier_id'], $_POST['DatePaid']);
+ } else
+ {
+ $_POST['amount'] = price_format(0);
+ }
+
bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
-
+
bank_balance_row($_POST['bank_account']);
table_section(2);
- ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT));
-
date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true);
+ ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT, null,
+ array('supplier'=>get_post('supplier_id'), 'date'=>get_post('DatePaid'))), false, ST_SUPPAYMENT);
+
+
table_section(3);
- $supplier_currency = get_supplier_currency($_POST['supplier_id']);
- $bank_currency = get_bank_account_currency($_POST['bank_account']);
+ $comp_currency = get_company_currency();
+ $supplier_currency = $_SESSION['alloc']->set_person($_POST['supplier_id'], PT_SUPPLIER);
+ if (!$supplier_currency)
+ $supplier_currency = $comp_currency;
+ $_SESSION['alloc']->currency = $bank_currency = get_bank_account_currency($_POST['bank_account']);
+
if ($bank_currency != $supplier_currency)
{
- exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid'], true);
+ amount_row(_("Bank Amount:"), 'bank_amount', null, '', $bank_currency);
}
- amount_row(_("Bank Charge:"), 'charge');
+ amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency);
+ $row = get_supplier($_POST['supplier_id']);
+ $_POST['dimension_id'] = @$row['dimension_id'];
+ $_POST['dimension2_id'] = @$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); // outer table
+ end_outer_table(1);
- if ($bank_currency == $supplier_currency) {
- div_start('alloc_tbl');
- show_allocatable(false);
- div_end();
- }
+ div_start('alloc_tbl');
+ show_allocatable(false);
+ div_end();
- start_table(TABLESTYLE, "width=60%");
- amount_row(_("Amount of Discount:"), 'discount');
- amount_row(_("Amount of Payment:"), 'amount');
+ start_table(TABLESTYLE, "width='60%'");
+ amount_row(_("Amount of Discount:"), 'discount', null, '', $supplier_currency);
+ amount_row(_("Amount of Payment:"), 'amount', null, '', $supplier_currency);
textarea_row(_("Memo:"), 'memo_', null, 22, 4);
end_table(1);
-
- if ($bank_currency != $supplier_currency)
- {
- display_note(_("The amount and discount are in the bank account's currency."), 0, 1);
- }
submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', 'default');
end_form();
end_page();
-?>
projects / fa-stable.git / blobdiff