X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fui%2Fgl_journal_ui.inc;h=1bb56c2a2f93271525a2cb3444f66c50dbfe3995;hb=d5618f84e921515fa6ce6ec05180f0651119c297;hp=bc68af7cfea564266eaa49dbae75cea035e75977;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git diff --git a/gl/includes/ui/gl_journal_ui.inc b/gl/includes/ui/gl_journal_ui.inc index bc68af7c..1bb56c2a 100644 --- a/gl/includes/ui/gl_journal_ui.inc +++ b/gl/includes/ui/gl_journal_ui.inc @@ -16,29 +16,30 @@ include_once($path_to_root . "/includes/ui/items_cart.inc"); function display_order_header(&$Order) { - global $table_style2; + global $Ajax; $qes = has_quick_entries(QE_JOURNAL); + $new = $Order->order_id==0; - start_outer_table("$table_style2 width=90%"); - table_section(1); + hidden('ref_original'); + start_outer_table(TABLESTYLE2, "width='90%'"); + table_section(1, $qes ? "20%" : ""); - start_row(); - date_cells(_("Date:"), 'date_'); - ref_cells(_("Reference:"), 'ref', '', references::get_next(0)); - end_row(); + date_row(_("Date:"), 'date_', '', $new); - if ($qes) - table_section(2, "20%"); - else - table_section(2, "50%"); + table_section(2, $qes ? "20%" : "50%"); + ref_row(_("Reference:"), 'ref', ''); + + if ($new) { + table_section(3, "20%"); + start_row(); + check_cells(_("Reverse Transaction:"), 'Reverse', null); + end_row(); + } - start_row(); - check_cells(_("Reverse Transaction:"), 'Reverse', null); - end_row(); if ($qes !== false) { - table_section(3, "50%"); + table_section(3, "40%"); start_row(); quick_entries_list_cells(_("Quick Entry").":", 'person_id', null, QE_JOURNAL, true); $qid = get_quick_entry(get_post('person_id')); @@ -46,8 +47,17 @@ function display_order_header(&$Order) unset($_POST['totamount']); // enable default $Ajax->activate('totamount'); } - amount_cells($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']), - null, "  ".submit('go', _("Go"), false, false, true)); + if ($qid['bal_type'] == 1) + { + end_row(); + start_row(); + $accname = get_gl_account_name($qid['base_desc']); + label_cell(($qid['base_amount'] == 0 ? _("Yearly") : _("Monthly")) . " ". _("balance from account")." ". + $qid['base_desc']." ".$accname."  ".submit('go', _("Go"), false, false, true), "colspan=2"); + } + else + amount_cells($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']), + null, "  ".submit('go', _("Go"), false, false, true)); end_row(); } @@ -59,14 +69,14 @@ function display_order_header(&$Order) function display_gl_items($title, &$order) { - global $table_style, $path_to_root; + global $path_to_root; display_heading($title); $dim = get_company_pref('use_dimension'); div_start('items_table'); - start_table("$table_style colspan=7 width=95%"); + start_table(TABLESTYLE, "width='95%'"); if ($dim == 2) $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1", _("Dimension")." 2", _("Debit"), _("Credit"), _("Memo"), ""); @@ -84,9 +94,9 @@ function display_gl_items($title, &$order) $k = 0; $id = find_submit('Edit'); - foreach ($order->gl_items as $item) + foreach ($order->gl_items as $line => $item) { - if ($id != $item->index) + if ($id != $line) { alt_table_row_color($k); @@ -107,15 +117,15 @@ function display_gl_items($title, &$order) } label_cell($item->reference); - edit_button_cell("Edit$item->index", _("Edit"), + edit_button_cell("Edit$line", _("Edit"), _('Edit journal line')); - delete_button_cell("Delete$item->index", _("Delete"), + delete_button_cell("Delete$line", _("Delete"), _('Remove line from journal')); end_row(); } else { - gl_edit_item_controls($order, $dim, $item->index); + gl_edit_item_controls($order, $dim, $line); } } @@ -129,6 +139,7 @@ function display_gl_items($title, &$order) label_cell(_("Total"), "align=right colspan=" . $colspan); amount_cell($order->gl_items_total_debit()); amount_cell(abs($order->gl_items_total_credit())); + label_cell('', "colspan=3"); end_row(); } @@ -146,6 +157,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $id = find_submit('Edit'); if ($Index != -1 && $Index == $id) { + // Modifying an existing row $item = $order->gl_items[$Index]; $_POST['code_id'] = $item->code_id; $_POST['dimension_id'] = $item->dimension_id; @@ -163,10 +175,9 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $_POST['description'] = $item->description; $_POST['LineMemo'] = $item->reference; - hidden('Index', $item->index); - hidden('code_id', $item->code_id); - label_cell($_POST['code_id']); - label_cell($item->description); + hidden('Index', $id); + $skip_bank = !$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL'); + echo gl_all_accounts_list('code_id', null, $skip_bank, true); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); if ($dim > 1) @@ -175,24 +186,26 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) } else { + // Adding a new row $_POST['AmountDebit'] = ''; //price_format(0); $_POST['AmountCredit'] = ''; //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 $_POST['_code_id_edit'] = ""; $_POST['code_id'] = ""; if(isset($_POST['_code_id_update'])) { $Ajax->activate('code_id'); } - $skip_bank = ($_SESSION["wa_current_user"]->access != 2); - gl_all_accounts_list('code_id', null, $skip_bank, true); + $skip_bank = !$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL'); + echo gl_all_accounts_list('code_id', null, $skip_bank, true); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); if ($dim > 1) dimensions_list_cells(null, 'dimension2_id', null, true, " ", false, 2); } + if ($dim < 1) hidden('dimension_id', 0); if ($dim < 2) @@ -200,7 +213,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) small_amount_cells(null, 'AmountDebit'); small_amount_cells(null, 'AmountCredit'); - text_cells_ex(null, 'LineMemo', 35, 50); + text_cells_ex(null, 'LineMemo', 35, 255); if ($id != -1) {