Fixed many issues in output HTML code according to HTML 4.01 Transitional format.

[fa-stable.git] / gl / includes / ui / gl_journal_ui.inc

diff --git a/gl/includes/ui/gl_journal_ui.inc b/gl/includes/ui/gl_journal_ui.inc
index d0f52cace5f5c46019bb2d68607a67f9c3bfdf80..1bb56c2a2f93271525a2cb3444f66c50dbfe3995 100644 (file)
--- 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"), "");
@@ -147,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;
@@ -165,9 +176,8 @@ 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);
+               $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) 
@@ -176,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)
@@ -201,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)
        {