projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed amibiguity in few text messages to make translations easier, updated gettext...
[fa-stable.git]
/
purchasing
/
supplier_payment.php
diff --git
a/purchasing/supplier_payment.php
b/purchasing/supplier_payment.php
index f9f1105e6961231bdd3790c75ec6d0c9fad14939..323ff16ec6f1911906e9ecefe7a5ce47cc5ef7ae 100644
(file)
--- a/
purchasing/supplier_payment.php
+++ b/
purchasing/supplier_payment.php
@@
-71,16
+71,16
@@
if (!isset($_POST['bank_account'])) { // first page call
if (isset($_GET['PInvoice'])) {
// get date and supplier
if (isset($_GET['PInvoice'])) {
// get date and supplier
- $inv = get_supp_trans($_GET['PInvoice'],
ST_SUPPINVOICE
);
+ $inv = get_supp_trans($_GET['PInvoice'],
$_GET['trans_type']
);
$dflt_act = get_default_bank_account($inv['curr_code']);
$_POST['bank_account'] = $dflt_act['id'];
$dflt_act = get_default_bank_account($inv['curr_code']);
$_POST['bank_account'] = $dflt_act['id'];
- if($inv) {
+ 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) {
$_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);
$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);
@@
-202,16
+202,8
@@
function check_inputs()
return false;
}
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_focus('ref');
return false;
}
@@
-295,7
+287,9
@@
start_form();
date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, 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);
table_section(3);