Moving 2.0 development version to main trunk.

[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 1b3c232fb03a3c25709f46f7c0e037cc07a335a8..a8878fcf06343dbbce9ddae8d991050f7211c1c4 100644 (file)
--- a/gl/includes/ui/gl_journal_ui.inc
+++ b/gl/includes/ui/gl_journal_ui.inc
@@ -15,7 +15,7 @@ function display_order_header(&$Order)
        echo "<table>";
        start_row();
     date_cells(_("Date:"), 'date_');
-       ref_cells(_("Reference:"), 'ref', references::get_next(0));
+       ref_cells(_("Reference:"), 'ref', '', references::get_next(0));
        end_row();
 
        echo "</table>";
@@ -42,6 +42,7 @@ function display_gl_items($title, &$order)
 
        $dim = get_company_pref('use_dimension');
 
+    div_start('items_table');
        start_table("$table_style colspan=7 width=95%");
        if ($dim == 2)
                $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
@@ -52,13 +53,17 @@ function display_gl_items($title, &$order)
        else
                $th = array(_("Account Code"), _("Account Description"),
                        _("Debit"), _("Credit"), _("Memo"));
+
+       if (count($order->gl_items)) $th[] = '';
+
        table_header($th);      
 
        $k = 0;
 
+       $id = find_submit('Edit');
        foreach ($order->gl_items as $item) 
        {
-               if (!isset($_GET['Edit']) || $_GET['Edit'] != $item->index)
+               if ($id != $item->index)
                {
                alt_table_row_color($k);
 
@@ -78,9 +83,12 @@ function display_gl_items($title, &$order)
                        amount_cell(abs($item->amount));
                }       
                        label_cell($item->reference);
-                       edit_link_cell("Edit=$item->index");
-                       delete_link_cell("Delete=$item->index");
-               end_row();;
+
+                       edit_button_cell("Edit$item->index", _("Edit"),
+                               _('Edit journal line'));
+                       edit_button_cell("Delete$item->index", _("Delete"),
+                               _('Remove line from journal'));
+               end_row();
                } 
                else 
                {
@@ -88,7 +96,7 @@ function display_gl_items($title, &$order)
                }
        }
 
-       if (!isset($_GET['Edit']))
+       if ($id == -1)
                gl_edit_item_controls($order, $dim);
 
        if ($order->count_gl_items()) 
@@ -102,57 +110,53 @@ function display_gl_items($title, &$order)
        }
 
     end_table();
+       div_end();
 }
 
 //---------------------------------------------------------------------------------
 
 function gl_edit_item_controls(&$order, $dim, $Index=null)
 {
+       global $Ajax;
        start_row();
 
-       if (isset($_GET['Edit']) && $Index != null)
+       $id = find_submit('Edit');
+       if ($Index != -1 && $Index == $id)
        {
                $item = $order->gl_items[$Index];
-               if (!isset($_POST['code_id']))
-                       $_POST['code_id'] = $item->code_id;
-               if (!isset($_POST['dimension_id']))
-                       $_POST['dimension_id'] = $item->dimension_id;
-               if (!isset($_POST['dimension2_id']))
-                       $_POST['dimension2_id'] = $item->dimension2_id;
-
-               if ((!isset($_POST['AmountDebit']) || ($_POST['AmountDebit']=="")) && $item->amount > 0)
-                       $_POST['AmountDebit'] = $item->amount;
-
-               if ((!isset($_POST['AmountCredit']) || ($_POST['AmountCredit']=="")) && $item->amount <= 0)
-                       $_POST['AmountCredit'] = abs($item->amount);
-
-               if (!isset($_POST['description']) || ($_POST['description'] == ""))
-                       $_POST['description'] = $item->description;
-               if (!isset($_POST['LineMemo']) || ($_POST['LineMemo'] == ""))
-                       $_POST['LineMemo'] = $item->reference;
+               $_POST['code_id'] = $item->code_id;
+               $_POST['dimension_id'] = $item->dimension_id;
+               $_POST['dimension2_id'] = $item->dimension2_id;
+               $_POST['AmountDebit'] = price_format($item->amount);
+               $_POST['AmountCredit'] = price_format(abs($item->amount));
+               $_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);
                if ($dim >= 1) 
-                       dimensions_list_cells(null, 'dimension_id', $_POST['dimension_id'], true, " ", false, 1);
+                       dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
                if ($dim > 1) 
-                       dimensions_list_cells(null, 'dimension2_id', $_POST['dimension2_id'], true, " ", false, 2);
+                       dimensions_list_cells(null, 'dimension2_id', null, true, " ", false, 2);
+           $Ajax->activate('items_table');
        }
        else
        {
-               $_POST['AmountDebit'] = 0;
-               $_POST['AmountCredit'] = 0;
+               $_POST['AmountDebit'] = '';  //price_format(0);
+               $_POST['AmountCredit'] = ''; //price_format(0);
                $_POST['dimension_id'] = 0;
                $_POST['dimension2_id'] = 0;
                $_POST['LineMemo'] = "";
-               $_POST['CodeID2'] = "";
+               $_POST['_code_id_edit'] = "";
                $_POST['code_id'] = "";
+               if(isset($_POST['_code_id_update'])) {
+                           $Ajax->activate('code_id');
+               }
                
-               text_cells(null, "CodeID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if(event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, false)'");
                $skip_bank = ($_SESSION["wa_current_user"]->access != 2);
-               gl_all_accounts_list_cells(null, 'code_id', null, $skip_bank, false, "return setAccount(1, false)");
+               gl_all_accounts_list('code_id', null, $skip_bank, false, true);
                if ($dim >= 1)
                        dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
                if ($dim > 1)
@@ -163,22 +167,25 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
        if ($dim < 2)
                hidden('dimension2_id', 0);
 
-       amount_cells(null, 'AmountDebit');
-       amount_cells(null, 'AmountCredit');
+       small_amount_cells(null, 'AmountDebit');
+       small_amount_cells(null, 'AmountCredit');
        text_cells_ex(null, 'LineMemo', 35, 50);
 
-       if (isset($_GET['Edit'])) 
+       if ($id != -1)
        {
-       submit_cells('UpdateItem', _("Update"));
-       submit_cells('CancelItemChanges', _("Cancel"));
+               edit_button_cell('UpdateItem', _("Update"),
+                               _('Confirm changes'));
+               edit_button_cell('CancelItemChanges', _("Cancel"),
+                               _('Cancel changes'));
+               set_focus('amount');
        } 
        else 
-               submit_cells('AddItem', _("Add item"), "colspan=2");
+               submit_cells('AddItem', _("Add Item"), "colspan=2",
+                   _('Add new line to journal'), true);
 
        end_row();
 }
 
-
 //---------------------------------------------------------------------------------
 
 function gl_options_controls()