X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fui%2Fgl_journal_ui.inc;h=bae82d3b511805b73fc5f6f16cc03f51ed443ffb;hb=604d89ac6d18712d8b55bed821afe07b7106db3d;hp=01a22ad330ff8c1c7fa9ec6fc87d0de0d1273222;hpb=5ddbc6107f4823f6b3629846aba63814bf958d38;p=fa-stable.git
diff --git a/gl/includes/ui/gl_journal_ui.inc b/gl/includes/ui/gl_journal_ui.inc
index 01a22ad3..bae82d3b 100644
--- a/gl/includes/ui/gl_journal_ui.inc
+++ b/gl/includes/ui/gl_journal_ui.inc
@@ -1,5 +1,14 @@
.
+***********************************************************************/
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/includes/ui/items_cart.inc");
@@ -10,44 +19,33 @@ function display_order_header(&$Order)
global $table_style2;
$qes = has_quick_entries(-1, 0);
- start_table("$table_style2 width=90%");
- if ($qes)
- echo "
"; // outer table
- echo "";
+ start_outer_table("$table_style2 width=90%");
+ table_section(1);
+
start_row();
date_cells(_("Date:"), 'date_');
ref_cells(_("Reference:"), 'ref', '', references::get_next(0));
end_row();
- echo " ";
-
if ($qes)
- echo " | "; // outer table
+ table_section(2, "20%");
else
- echo " | "; // outer table
+ table_section(2, "50%");
- echo "";
start_row();
check_cells(_("Reverse Transaction:"), 'Reverse', null);
end_row();
- echo " ";
if ($qes !== false)
{
- echo " | "; // outer table
- echo "";
+ table_section(3, "50%");
start_row();
quick_entries_list_cells(_("Quick Entry:"), 'person_id', null, -1, 0);
amount_cells(_("Total Amount"), 'totamount', null, null, " ".submit('go', _("Go"), false, false, true));
end_row();
- echo " ";
}
-
- echo " |
"; // outer table
- end_table(1);
+ end_outer_table(1);
}
//---------------------------------------------------------------------------------
@@ -64,13 +62,13 @@ function display_gl_items($title, &$order)
start_table("$table_style colspan=7 width=95%");
if ($dim == 2)
$th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
- _("Dimension")." 2", _("Debit"), _("Credit"), _("Memo"));
+ _("Dimension")." 2", _("Debit"), _("Credit"), _("Memo"), "");
else if ($dim == 1)
$th = array(_("Account Code"), _("Account Description"), _("Dimension"),
- _("Debit"), _("Credit"), _("Memo"));
+ _("Debit"), _("Credit"), _("Memo"), "");
else
$th = array(_("Account Code"), _("Account Description"),
- _("Debit"), _("Credit"), _("Memo"));
+ _("Debit"), _("Credit"), _("Memo"), "");
if (count($order->gl_items)) $th[] = '';
@@ -104,7 +102,7 @@ function display_gl_items($title, &$order)
edit_button_cell("Edit$item->index", _("Edit"),
_('Edit journal line'));
- edit_button_cell("Delete$item->index", _("Delete"),
+ delete_button_cell("Delete$item->index", _("Delete"),
_('Remove line from journal'));
end_row();
}
@@ -182,7 +180,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)
@@ -199,10 +197,10 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
if ($id != -1)
{
- edit_button_cell('UpdateItem', _("Update"),
- _('Confirm changes'));
- edit_button_cell('CancelItemChanges', _("Cancel"),
- _('Cancel changes'));
+ button_cell('UpdateItem', _("Update"),
+ _('Confirm changes'), ICON_UPDATE);
+ button_cell('CancelItemChanges', _("Cancel"),
+ _('Cancel changes'), ICON_CANCEL);
set_focus('amount');
}
else