Merged changes form main trunk since 2.1RC

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

diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index 3af6202c13506b59a78a13da8c115b19014af405..ccb3e33fda00c61c3f721042b7b0c809f7ee0521 100644 (file)
--- a/gl/includes/ui/gl_bank_ui.inc
+++ b/gl/includes/ui/gl_bank_ui.inc
@@ -133,9 +133,9 @@ function display_gl_items($title, &$order)
        $k = 0;  //row colour counter
 
        $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);
 
@@ -152,15 +152,15 @@ function display_gl_items($title, &$order)
                                amount_cell($item->amount);
                        label_cell($item->reference);
 
-                       edit_button_cell("Edit$item->index", _("Edit"),
+                       edit_button_cell("Edit$line", _("Edit"),
                                _('Edit document line'));
-                       delete_button_cell("Delete$item->index", _("Delete"),
+                       delete_button_cell("Delete$line", _("Delete"),
                                _('Remove line from document'));
                end_row();
                }
                else
                {
-                       gl_edit_item_controls($order, $dim, $item->index);
+                       gl_edit_item_controls($order, $dim, $line);
                }
        }
 
@@ -168,7 +168,7 @@ function display_gl_items($title, &$order)
                gl_edit_item_controls($order, $dim);
 
        if ($order->count_gl_items())
-               label_row(_("Total"), number_format2(abs($order->gl_items_total()), user_price_dec()),"colspan=" . $colspan . " align=right", "align=right");
+               label_row(_("Total"), number_format2(abs($order->gl_items_total()), user_price_dec()),"colspan=" . $colspan . " align=right", "align=right",3);
 
     end_table();
        div_end();
@@ -193,7 +193,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);