X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fui%2Fgl_bank_ui.inc;h=981569c420943b06583a958f3daa11ad14bdd664;hb=acb313fc11ab4aa40e48b46c1534d09114638f6c;hp=27027f83638619a035aaf7b2e2015497d478c5fa;hpb=a5e307dbec066b7a47b911b889e380a6ff2fcede;p=fa-stable.git
diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index 27027f83..981569c4 100644
--- a/gl/includes/ui/gl_bank_ui.inc
+++ b/gl/includes/ui/gl_bank_ui.inc
@@ -14,29 +14,17 @@ function display_bank_header(&$order)
global $Ajax, $Refs;
$payment = $order->trans_type == ST_BANKPAYMENT;
+ $customer_error = false;
div_start('pmt_header');
- start_outer_table(TABLESTYLE2, "width=90%"); // outer table
+ start_outer_table(TABLESTYLE2, "width='90%'"); // outer table
table_section(1);
- if (list_updated('PayType') || list_updated('person_id'))
- {
- if ($_POST['PayType'] == PT_CUSTOMER || $_POST['PayType'] == PT_SUPPLIER)
- {
- $Ajax->activate('person_id');
- if ($_POST['PayType'] == PT_CUSTOMER)
- $_POST['bank_account'] = get_default_customer_bank_account($_POST['person_id']);
- else
- $_POST['bank_account'] = get_default_supplier_bank_account($_POST['person_id']);
- }
- }
- bank_accounts_list_row( $payment ? _("From:") : _("To:"), 'bank_account', null, true);
- if ($payment)
- bank_balance_row($_POST['bank_account']);
-
date_row(_("Date:"), 'date_', '', true, 0, 0, 0, null, true);
+ ref_row(_("Reference:"), 'ref', '');
+
table_section(2, "33%");
if (!isset($_POST['PayType']))
@@ -59,6 +47,7 @@ function display_bank_header(&$order)
$Ajax->activate('code_id');
$Ajax->activate('pagehelp');
$Ajax->activate('editors');
+ $Ajax->activate('footer');
}
payment_person_types_list_row( $payment ? _("Pay To:"):_("From:"),
'PayType', $_POST['PayType'], true);
@@ -87,6 +76,17 @@ function display_bank_header(&$order)
$_POST['PersonDetailID'] = ANY_NUMERIC;
hidden('PersonDetailID');
}
+ $trans = get_customer_habit($_POST['person_id']); // take care of customers on hold
+ if ($trans['dissallow_invoices'] != 0)
+ {
+ if ($payment)
+ {
+ $customer_error = true;
+ display_error(_("This customer account is on hold."));
+ }
+ else
+ display_warning(_("This customer account is on hold."));
+ }
break;
case PT_QUICKENTRY :
@@ -94,6 +94,7 @@ function display_bank_header(&$order)
$qid = get_quick_entry(get_post('person_id'));
if (list_updated('person_id')) {
unset($_POST['totamount']); // enable default
+ $Ajax->activate('footer');
$Ajax->activate('totamount');
}
amount_row($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
@@ -104,18 +105,35 @@ function display_bank_header(&$order)
// break;
}
- $person_currency = payment_person_currency($_POST['PayType'], $_POST['person_id']);
- $bank_currency = get_bank_account_currency($_POST['bank_account']);
+ table_section(3, "33%");
- exchange_rate_display($bank_currency, $person_currency, $_POST['date_']);
+ if (!$order->order_id && !get_post('bank_account'))
+ {
+ if ($_POST['PayType'] == PT_CUSTOMER)
+ $_POST['bank_account'] = get_default_customer_bank_account($_POST['person_id']);
+ elseif ($_POST['PayType'] == PT_SUPPLIER)
+ $_POST['bank_account'] = get_default_supplier_bank_account($_POST['person_id']);
+ else
+ unset($_POST['bank_account']);
+ }
+
+ bank_accounts_list_row( $payment ? _("From:") : _("Into:"), 'bank_account', null, true);
+ if ($payment)
+ bank_balance_row($_POST['bank_account']);
- table_section(3, "33%");
+ $bank_currency = get_bank_account_currency($_POST['bank_account']);
- ref_row(_("Reference:"), 'ref', '');
+ exchange_rate_display(get_company_currency(), $bank_currency, $_POST['date_']);
end_outer_table(1); // outer table
div_end();
+ if ($customer_error)
+ {
+ end_form();
+ end_page();
+ exit;
+ }
}
//---------------------------------------------------------------------------------
@@ -128,7 +146,7 @@ function display_gl_items($title, &$order)
display_heading($title);
div_start('items_table');
- start_table(TABLESTYLE, "colspan=7 width=95%");
+ start_table(TABLESTYLE, "width='95%'");
if ($dim == 2)
$th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
@@ -274,13 +292,27 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
//---------------------------------------------------------------------------------
-function gl_options_controls()
+function gl_options_controls($order)
{
+ div_start('footer');
echo "