projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes in sales reports to use debtor_trans.tax_included field instead of trans_tax_de...
[fa-stable.git]
/
purchasing
/
supplier_payment.php
diff --git
a/purchasing/supplier_payment.php
b/purchasing/supplier_payment.php
index 276a821c7734ec3de7b0e5bfedcc8627db20d9e1..b28259e44b3fe90200a1e1d9ff51756c9810f089 100644
(file)
--- a/
purchasing/supplier_payment.php
+++ b/
purchasing/supplier_payment.php
@@
-59,6
+59,7
@@
if (isset($_POST['_DatePaid_changed'])) {
if (list_updated('supplier_id') || list_updated('bank_account')) {
$_SESSION['alloc']->read();
if (list_updated('supplier_id') || list_updated('bank_account')) {
$_SESSION['alloc']->read();
+ $_POST['memo_'] = $_POST['amount'] = '';
$Ajax->activate('alloc_tbl');
}
//----------------------------------------------------------------------------------------
$Ajax->activate('alloc_tbl');
}
//----------------------------------------------------------------------------------------
@@
-77,7
+78,7
@@
if (!isset($_POST['bank_account'])) { // first page call
$_POST['memo_'] = $inv['supp_reference'];
foreach($_SESSION['alloc']->allocs as $line => $trans) {
if ($trans->type == ST_SUPPINVOICE && $trans->type_no == $_GET['PInvoice']) {
$_POST['memo_'] = $inv['supp_reference'];
foreach($_SESSION['alloc']->allocs as $line => $trans) {
if ($trans->type == ST_SUPPINVOICE && $trans->type_no == $_GET['PInvoice']) {
- $_POST['amount'] =
+ $_POST['amount'] =
$_SESSION['alloc']->amount = price_format($_SESSION['alloc']->allocs[$line]->amount);
$_SESSION['alloc']->allocs[$line]->current_allocated =
$_SESSION['alloc']->allocs[$line]->amount;
$_SESSION['alloc']->amount = price_format($_SESSION['alloc']->allocs[$line]->amount);
$_SESSION['alloc']->allocs[$line]->current_allocated =
$_SESSION['alloc']->allocs[$line]->amount;
@@
-87,7
+88,6
@@
if (!isset($_POST['bank_account'])) { // first page call
unset($inv);
} else
display_error(_("Invalid purchase invoice number."));
unset($inv);
} else
display_error(_("Invalid purchase invoice number."));
-
}
}
if (isset($_GET['AddedID'])) {
}
}
if (isset($_GET['AddedID'])) {
@@
-139,7
+139,7
@@
function check_inputs()
}
if (isset($_POST['charge']) && input_num('charge') > 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 (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');
@@
-182,7
+182,7
@@
function check_inputs()
}
elseif (!is_date_in_fiscalyear($_POST['DatePaid']))
{
}
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;
}
set_focus('DatePaid');
return false;
}
@@
-273,9
+273,12
@@
start_form();
supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
set_global_supplier($_POST['supplier_id']);
supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
set_global_supplier($_POST['supplier_id']);
-
+
+ if (!list_updated('bank_account'))
+ $_POST['bank_account'] = get_default_supplier_bank_account($_POST['supplier_id']);
+
bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
-
+
bank_balance_row($_POST['bank_account']);
table_section(2);
bank_balance_row($_POST['bank_account']);
table_section(2);
@@
-299,9
+302,9
@@
start_form();
end_outer_table(1); // outer table
if ($bank_currency == $supplier_currency) {
end_outer_table(1); // outer table
if ($bank_currency == $supplier_currency) {
- div_start('alloc_tbl');
+
div_start('alloc_tbl');
show_allocatable(false);
show_allocatable(false);
- div_end();
+
div_end();
}
start_table(TABLESTYLE, "width=60%");
}
start_table(TABLESTYLE, "width=60%");