New files from unstable branch

[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 3b4698c04b5043882bcbe5f2d0599a3303d95e9e..8c4aec6ae44d2b27e7db29c0c6013add32e4a7b4 100644 (file)
--- a/gl/includes/ui/gl_journal_ui.inc
+++ b/gl/includes/ui/gl_journal_ui.inc
@@ -16,12 +16,12 @@ include_once($path_to_root . "/includes/ui/items_cart.inc");
 
 function display_order_header(&$Order)
 {
-       global $table_style2, $Ajax;
+       global $Ajax;
 
        $qes = has_quick_entries(QE_JOURNAL);
        $new = $Order->order_id==0;
-       start_outer_table("$table_style2 width=90%");
-       table_section(1);
+       start_outer_table(TABLESTYLE2, "width=90%");
+       table_section(1, $qes ? "20%" : "");
 
        start_row();
     date_cells(_("Date:"), 'date_', '', $new);
@@ -41,7 +41,7 @@ function display_order_header(&$Order)
 
        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'));
@@ -49,8 +49,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();
 
        }
@@ -62,14 +71,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, "colspan=7 width=95%");
        if ($dim == 2)
                $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
                        _("Dimension")." 2", _("Debit"), _("Credit"), _("Memo"), "");