Improved quick entries.

[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 c5b5eb15a0c079169f0443bb02d19599eaea057e..1a2a9b4ee06193b26f30bc8e32df18f4bb1632c8 100644 (file)
--- a/gl/includes/ui/gl_journal_ui.inc
+++ b/gl/includes/ui/gl_journal_ui.inc
@@ -18,45 +18,41 @@ function display_order_header(&$Order)
 {
        global $table_style2;
 
-       $qes = has_quick_entries(-1, 0);
-       start_table("$table_style2 width=90%");
-       if ($qes)
-               echo "<tr><td valign=top width=30%>"; // outer table
-       else    
-               echo "<tr><td valign=top width=50%>"; // outer table
+       $qes = has_quick_entries(QE_JOURNAL);
+
+       start_outer_table("$table_style2 width=90%");
+       table_section(1);
 
-       echo "<table>";
        start_row();
     date_cells(_("Date:"), 'date_');
        ref_cells(_("Reference:"), 'ref', '', references::get_next(0));
        end_row();
 
-       echo "</table>";
-
        if ($qes)
-               echo "</td><td width=20%>"; // outer table
+               table_section(2, "20%");
        else    
-               echo "</td><td width=50%>"; // outer table
+               table_section(2, "50%");
 
-       echo "<table>";
        start_row();
        check_cells(_("Reverse Transaction:"), 'Reverse', null);
        end_row();
-       echo "</table>";
        if ($qes !== false)
        {
-               echo "</td><td width=50%>"; // outer table
-               echo "<table>";
+               table_section(3, "50%");
                start_row();
-               quick_entries_list_cells(_("Quick Entry:"), 'person_id', null, -1, 0);
-               amount_cells(_("Total Amount"), 'totamount', null, null, "&nbsp;&nbsp;".submit('go', _("Go"), false, false, true));                     
+               quick_entries_list_cells(_("Quick Entry").":", 'person_id', null, QE_JOURNAL, true);
+               $qid = get_quick_entry(get_post('person_id'));
+               if (list_updated('person_id')) {
+                       unset($_POST['totamount']); // enable default
+               $Ajax->activate('totamount');
+               }
+               amount_cells($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
+                null, "&nbsp;&nbsp;".submit('go', _("Go"), false, false, true));
                end_row();
-               echo "</table>";
+
        }
                
-
-       echo "</td></tr>"; // outer table
-       end_table(1);
+       end_outer_table(1);
 }
 
 //---------------------------------------------------------------------------------
@@ -191,7 +187,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
                }
                
                $skip_bank = ($_SESSION["wa_current_user"]->access != 2);
-               gl_all_accounts_list('code_id', null, $skip_bank, false, true);
+               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)