if (isset($_GET['PInvoice'])) {
// get date and supplier
- $inv = get_supp_trans($_GET['PInvoice'], ST_SUPPINVOICE);
- $dflt_act = get_default_bank_account($inv['curr_code']);
- $_POST['bank_account'] = $dflt_act['id'];
- if($inv) {
+ $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['memo_'] = $inv['supp_reference'];
foreach($_SESSION['alloc']->allocs as $line => $trans) {
- if ($trans->type == ST_SUPPINVOICE && $trans->type_no == $_GET['PInvoice']) {
+ 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);
//----------------------------------------------------------------------------------------
+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 (!$Refs->is_valid($_POST['ref']))
- {
- display_error(_("You must enter a reference."));
- set_focus('ref');
- return false;
- }
-
- if (!is_new_reference($_POST['ref'], ST_SUPPAYMENT))
+ if (!check_reference($_POST['ref'], ST_SUPPAYMENT))
{
- display_error(_("The entered reference is already in use."));
set_focus('ref');
return false;
}
set_global_supplier($_POST['supplier_id']);
if (!list_updated('bank_account') && !get_post('__ex_rate_changed'))
- $_POST['bank_account'] = get_default_supplier_bank_account($_POST['supplier_id']);
- else
+ {
+ $_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);
date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true);
- ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT));
+ 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);
if ($bank_currency != $supplier_currency)
{
- amount_row(_("Bank Amount:"), 'bank_amount', null, '', $bank_currency, 2);
+ amount_row(_("Bank Amount:"), 'bank_amount', null, '', $bank_currency);
}
amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency);