X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fui%2Fgl_bank_ui.inc;h=e0e1b124f3d9d8383cfa69e335f5342a8cba85c2;hb=d6cbf4c364cbdf94409597e87bea9b555ae86451;hp=507ff4cf4c779077fd71961744415be212f62c2a;hpb=c295561f11414066682ce0073dc05e2524b03fc9;p=fa-stable.git diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc index 507ff4cf..e0e1b124 100644 --- a/gl/includes/ui/gl_bank_ui.inc +++ b/gl/includes/ui/gl_bank_ui.inc @@ -11,18 +11,19 @@ ***********************************************************************/ function display_bank_header(&$order) { - global $table_style2, $Ajax; - $payment = $order->trans_type == systypes::bank_payment(); + global $Ajax, $Refs; + $payment = $order->trans_type == ST_BANKPAYMENT; + $customer_error = false; div_start('pmt_header'); - start_outer_table("width=90% $table_style2"); // outer table + start_outer_table(TABLESTYLE2, "width=90%"); // outer table table_section(1); - bank_accounts_list_row( $payment ? _("From:") : _("To:"), 'bank_account', null, true); + date_row(_("Date:"), 'date_', '', true, 0, 0, 0, null, true); - date_row(_("Date:"), 'date_', '', null, 0, 0, 0, null, true); + ref_row(_("Reference:"), 'ref', ''); table_section(2, "33%"); @@ -44,36 +45,50 @@ function display_bank_header(&$order) $_POST['person_id'] = ''; $Ajax->activate('pmt_header'); $Ajax->activate('code_id'); + $Ajax->activate('pagehelp'); + $Ajax->activate('editors'); } payment_person_types_list_row( $payment ? _("Pay To:"):_("From:"), 'PayType', $_POST['PayType'], true); switch ($_POST['PayType']) { - case payment_person_types::misc() : + case PT_MISC : text_row_ex($payment ?_("To the Order of:"):_("Name:"), 'person_id', 40, 50); break; - case payment_person_types::WorkOrder() : - workorders_list_row(_("Work Order:"), 'person_id', null); - break; - case payment_person_types::supplier() : - supplier_list_row(_("Supplier:"), 'person_id', null, false, true); + //case PT_WORKORDER : + // workorders_list_row(_("Work Order:"), 'person_id', null); + // break; + case PT_SUPPLIER : + supplier_list_row(_("Supplier:"), 'person_id', null, false, true, false, true); break; - case payment_person_types::customer() : - customer_list_row(_("Customer:"), 'person_id', null, false, true); + case PT_CUSTOMER : + customer_list_row(_("Customer:"), 'person_id', null, false, true, false, true); if (db_customer_has_branches($_POST['person_id'])) { - customer_branches_list_row(_("Branch:"), $_POST['person_id'], 'PersonDetailID', null, false, true, true); + customer_branches_list_row(_("Branch:"), $_POST['person_id'], + 'PersonDetailID', null, false, true, true, true); } else { - $_POST['PersonDetailID'] = reserved_words::get_any_numeric(); + $_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 payment_person_types::QuickEntry() : + case PT_QUICKENTRY : quick_entries_list_row(_("Type").":", 'person_id', null, ($payment ? QE_PAYMENT : QE_DEPOSIT), true); $qid = get_quick_entry(get_post('person_id')); if (list_updated('person_id')) { @@ -88,34 +103,49 @@ function display_bank_header(&$order) // break; } - $person_currency = payment_person_types::person_currency($_POST['PayType'], $_POST['person_id']); + table_section(3, "33%"); + + if (!$order->order_id && !list_updated('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']); + + $person_currency = payment_person_currency($_POST['PayType'], $_POST['person_id']); $bank_currency = get_bank_account_currency($_POST['bank_account']); exchange_rate_display($bank_currency, $person_currency, $_POST['date_']); - table_section(3, "33%"); - - if (isset($_GET['NewPayment'])) - ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_payment())); - else - ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_deposit())); - end_outer_table(1); // outer table div_end(); + if ($customer_error) + { + end_form(); + end_page(); + exit; + } } //--------------------------------------------------------------------------------- function display_gl_items($title, &$order) { - global $table_style, $path_to_root; + global $path_to_root; $dim = get_company_pref('use_dimension'); $colspan = ($dim == 2 ? 4 : ($dim == 1 ? 3 : 2)); display_heading($title); div_start('items_table'); - start_table("$table_style colspan=7 width=95%"); + start_table(TABLESTYLE, "colspan=7 width=95%"); if ($dim == 2) $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1", @@ -146,7 +176,7 @@ function display_gl_items($title, &$order) if ($dim > 1) label_cell(get_dimension_string($item->dimension2_id, true)); //amount_cell(abs($item->amount)); - if ($order->trans_type == systypes::bank_deposit()) + if ($order->trans_type == ST_BANKDEPOSIT) amount_cell(-$item->amount); else amount_cell($item->amount); @@ -179,7 +209,7 @@ function display_gl_items($title, &$order) function gl_edit_item_controls(&$order, $dim, $Index=null) { global $Ajax; - $payment = $order->trans_type == systypes::bank_payment(); + $payment = $order->trans_type == ST_BANKPAYMENT; start_row(); $id = find_submit('Edit'); @@ -194,9 +224,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $_POST['LineMemo'] = $item->reference; hidden('Index', $id); - hidden('code_id', $item->code_id); - label_cell($_POST['code_id']); - label_cell($item->description); + echo gl_all_accounts_list('code_id', null, true, true); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); if ($dim > 1) @@ -208,28 +236,28 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $_POST['amount'] = price_format(0); $_POST['dimension_id'] = 0; $_POST['dimension2_id'] = 0; - $_POST['LineMemo'] = ""; + //$_POST['LineMemo'] = ""; // let memo go to next line Joe Hunt 2010-05-30 if(isset($_POST['_code_id_update'])) { $Ajax->activate('code_id'); } - if ($_POST['PayType'] == payment_person_types::customer()) + if ($_POST['PayType'] == PT_CUSTOMER) { $acc = get_branch_accounts($_POST['PersonDetailID']); $_POST['code_id'] = $acc['receivables_account']; } - elseif ($_POST['PayType'] == payment_person_types::supplier()) + elseif ($_POST['PayType'] == PT_SUPPLIER) { $acc = get_supplier_accounts($_POST['person_id']); $_POST['code_id'] = $acc['payable_account']; } - elseif ($_POST['PayType'] == payment_person_types::WorkOrder()) - $_POST['code_id'] = get_company_pref('default_assembly_act'); + //elseif ($_POST['PayType'] == PT_WORKORDER) + // $_POST['code_id'] = get_company_pref('default_assembly_act'); else { $_POST['code_id'] = get_company_pref($payment ? 'default_cogs_act':'default_inv_sales_act'); } - gl_all_accounts_list('code_id', null, false, true); + echo gl_all_accounts_list('code_id', null, true, true); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); if ($dim > 1) @@ -241,7 +269,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) hidden('dimension2_id', 0); amount_cells(null, 'amount'); - text_cells_ex(null, 'LineMemo', 35, 50); + text_cells_ex(null, 'LineMemo', 35, 255); if ($id != -1) {