Added text fields sanitization on upgrdae to 2.2.

[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 1a2a9b4ee06193b26f30bc8e32df18f4bb1632c8..db92a7bb04660e09836078a881a047fdc88b7e33 100644 (file)
--- a/gl/includes/ui/gl_journal_ui.inc
+++ b/gl/includes/ui/gl_journal_ui.inc
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/ui/items_cart.inc");
@@ -16,26 +16,31 @@ include_once($path_to_root . "/includes/ui/items_cart.inc");
 
 function display_order_header(&$Order)
 {
-       global $table_style2;
+       global $table_style2, $Ajax;
 
        $qes = has_quick_entries(QE_JOURNAL);
-
+       $new = $Order->order_id==0;
        start_outer_table("$table_style2 width=90%");
        table_section(1);
 
        start_row();
-    date_cells(_("Date:"), 'date_');
-       ref_cells(_("Reference:"), 'ref', '', references::get_next(0));
+    date_cells(_("Date:"), 'date_', '', $new);
+
+       table_section(2, $qes ? "20%" : "50%");
+       if ($new)
+               ref_cells(_("Reference:"), 'ref', '');
+       else
+               label_cells(_("Reference:"), $Order->reference);
        end_row();
 
-       if ($qes)
-               table_section(2, "20%");
-       else    
-               table_section(2, "50%");
 
-       start_row();
-       check_cells(_("Reverse Transaction:"), 'Reverse', null);
-       end_row();
+       if ($new) {
+               table_section(3, "20%");
+               start_row();
+               check_cells(_("Reverse Transaction:"), 'Reverse', null);
+               end_row();
+       }
+
        if ($qes !== false)
        {
                table_section(3, "50%");
@@ -84,9 +89,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 +112,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 +134,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();
        }
 
@@ -163,7 +169,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
                $_POST['description'] = $item->description;
                $_POST['LineMemo'] = $item->reference;
 
-               hidden('Index', $item->index);
+               hidden('Index', $id);
                hidden('code_id', $item->code_id);
                label_cell($_POST['code_id']);
                label_cell($item->description);
@@ -186,7 +192,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
                            $Ajax->activate('code_id');
                }
                
-               $skip_bank = ($_SESSION["wa_current_user"]->access != 2);
+               $skip_bank = !$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL');
                gl_all_accounts_list('code_id', null, $skip_bank, true);
                if ($dim >= 1)
                        dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);